计划制定界面相关的修改
提交冲突
更新
更新
Merge branch 'master' of https://github.com/UniCloud/FRP

Conflicts:
	Application.BaseManagementBC.DTO/FunctionItemDTO/FunctionItemDTO.cs
	Application.BaseManagementBC.DTO/RoleDTO/RoleDTO.cs
	Application.BaseManagementBC.DTO/UserDTO/UserDTO.cs
	Application.BaseManagementBC.Query/FunctionItemQueries/FunctionItemQuery.cs
	Application.BaseManagementBC.Query/FunctionItemQueries/IFunctionItemQuery.cs
	Application.BaseManagementBC.Query/UserQueries/IUserQuery.cs
	Application.BaseManagementBC.Query/UserQueries/UserQuery.cs
	Application.BaseManagementBC.Tests/FunctionItemBCTests.cs
	Application.BaseManagementBC/FunctionItemServices/FunctionItemAppService.cs
	Application.BaseManagementBC/FunctionItemServices/IFunctionItemAppService.cs
	Application.BaseManagementBC/UserServices/IUserAppService.cs
	Application.BaseManagementBC/UserServices/UserAppService.cs
	Application.CommonServiceBC.Query/DocumentQueries/DocumentQuery.cs
	Application.CommonServiceBC.Query/DocumentQueries/IDocumentQuery.cs
	Application.CommonServiceBC.Tests/DocumentBCTest.cs
	Application.CommonServiceBC/DocumentServices/DocumentAppService.cs
	Application.CommonServiceBC/DocumentServices/IDocumentAppService.cs
	Application.PurchaseBC/DocumentPathServices/DocumentPathAppService.cs
	DistributedServices.AircraftConfig/Web.config
	DistributedServices.BaseManagement/BaseManagementData.cs
	DistributedServices.BaseManagement/InstanceProviders/Container.cs
	DistributedServices.FleetPlan/Web.config
	DistributedServices.Part/Web.config
	DistributedServices.Purchase/Web.config
	Domain.BaseManagementBC/Aggregates/OrganizationAgg/Organization.cs
	Domain.BaseManagementBC/Aggregates/OrganizationUserAgg/IOrganizationUserRepository.cs
	Domain.BaseManagementBC/Aggregates/RoleAgg/IRoleRepository.cs
	Domain.BaseManagementBC/Aggregates/RoleAgg/Role.cs
	Domain.BaseManagementBC/Aggregates/RoleFunctionAgg/RoleFunction.cs
	Domain.BaseManagementBC/Aggregates/UserAgg/IUserRepository.cs
	Domain.BaseManagementBC/Aggregates/UserAgg/User.cs
	Domain.BaseManagementBC/Aggregates/UserAgg/UserFactory.cs
	Domain.BaseManagementBC/Aggregates/UserRoleAgg/UserRole.cs
	Domain.BaseManagementBC/Services/IOrganizationRoleService.cs
	Domain.BaseManagementBC/Services/IOrganizationUserService.cs
	Domain.BaseManagementBC/Services/IRoleFunctionService.cs
	Domain.BaseManagementBC/Services/IUserRoleService.cs
	Domain.PurchaseBC/Aggregates/DocumentPathAgg/DocumentPathFactory.cs
	Domain.UberModel/Aggregates/RoleAgg/Role.cs
	Domain.UberModel/Aggregates/RoleFunctionAgg/RoleFunction.cs
	Domain.UberModel/Aggregates/UserAgg/User.cs
	Domain.UberModel/Aggregates/UserRoleAgg/UserRole.cs
	Infrastructure.Data.BaseManagementBC/Repositories/FunctionItemRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/OrganizationRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/OrganizationRoleRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/OrganizationUserRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/RoleFunctionRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/RoleRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/UserRepository.cs
	Infrastructure.Data.BaseManagementBC/Repositories/UserRoleRepository.cs
	Infrastructure.Data.BaseManagementBC/UnitOfWork/Mapping/Sql/RoleEntityConfiguration.cs
	Infrastructure.Data.BaseManagementBC/UnitOfWork/Mapping/Sql/RoleFunctionEntityConfiguration.cs
	Infrastructure.Data.BaseManagementBC/UnitOfWork/Mapping/Sql/UserEntityConfiguration.cs
	Infrastructure.Data.UberModel/InitialData/SupplierData.cs
	Infrastructure.Data.UberModel/UnitOfWork/Mapping/Sql/RoleEntityConfiguration.cs
	Infrastructure.Data.UberModel/UnitOfWork/Mapping/Sql/RoleFunctionEntityConfiguration.cs
	Infrastructure.Data.UberModel/UnitOfWork/Mapping/Sql/UserEntityConfiguration.cs
	UniCloud.Presentation.BaseManagement/ManagePermission/ManageFunctionsInRoleVm.cs
	UniCloud.Presentation.BaseManagement/ManagePermission/ManageUserInRoleVm.cs
	UniCloud.Presentation.BaseManagement/Properties/AssemblyInfo.cs
	UniCloud.Presentation.CommonService/SearchDocument/DocumentDoubleClickHelper.cs
	UniCloud.Presentation.Payment/PaymentNotice/PaymentNoticeVm.cs
	UniCloud.Presentation.Payment/PaymentNotice/SelectInvoicesVm.cs
	UniCloud.Presentation.Service.BaseManagement/Service References/BaseManagement/Reference.cs
	UniCloud.Presentation.Service.CommonService/Service References/Common/Reference.cs
	UniCloud.Presentation.Service.Payment/Service References/Payment/Reference.cs
	UniCloud.Presentation.Service.Purchase/Service References/Purchase/Reference.cs
	UniCloud.Presentation/Document/DocViewerVM.cs