Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase
# Conflicts:
# src/aspnet-core/ICS.Application/Business/Dtos/基础设置/SysDataBase/GetSysDataBaseForEditOutput.cs
# src/aspnet-core/ICS.Application/IcsApplicationModule.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsTest/CreateOrUpdateIcsTestInput.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsTest/GetIcsTestsInput.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsTest/IcsTestEditDto.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Dtos/IcsTest/IcsTestListDto.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Mapper/IcsTest/IcsTestDtoAutoMapper.cs
# src/aspnet-core/src/YoyoBoot.Application/Business/Service/IcsTest/IIcsTestAppService.cs
# src/aspnet-core/src/YoyoBoot.Application/YoyoBootApplicationModule.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/Authorization/IcsTest/IcsTestAuthorizationProvider.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/DomainService/IcsTest/IIcsTestManager.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/DomainService/IcsTest/IcsTestManager.cs
# src/aspnet-core/src/YoyoBoot.Core/Business/Entity/IcsTest/IcsTest.cs
# src/aspnet-core/src/YoyoBoot.Core/Localization/SourceFiles/YoyoBoot-zh-Hans.json
# src/aspnet-core/src/YoyoBoot.EntityFrameworkCore/EntityFrameworkCore/YoyoBootDbContext.cs
# src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json
|
xusc
xuhong80
lacy
xusc