ImportDataService.cs
19.1 KB
-
Merge branch 'v2020calculate' into v2020collect · 317a3cc9
# Conflicts: # performance/Performance.Api/wwwroot/Performance.Api.xml # performance/Performance.Api/wwwroot/Performance.DtoModels.xml # performance/Performance.Infrastructure/Helper/JsonHelper.cs # performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
lcx committed