修复供应商角色维修供应商问题
保函相关
Merge branch 'master' of https://github.com/UniCloud/FRP

Conflicts:
	Domain.PaymentBC/Aggregates/GuaranteeAgg/Guarantee.cs
	UniCloud.Presentation.Shell.Web/ClientBin/Purchase.xap
Merge branch 'master' of https://github.com/UniCloud/FRP.git
Merge branch 'master' of https://github.com/UniCloud/FRP

Conflicts:
	UniCloud.Presentation.Purchase/Contract/AircraftPurchaseVM.cs