AllotService.cs
32.1 KB
-
Merge branch 'v2020morge' into v2020morge-graphql · cf8d50a4
# Conflicts: # performance/Performance.Api/Controllers/SecondAllotController.cs # performance/Performance.EntityModels/Entity/im_accountbasic.cs # performance/Performance.Repository/PerforCofdirectorRepository.cs # performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs
lcx committed