ConfigService.cs
24.2 KB
-
Merge branch 'feature/merge' into develop · ea50492b
# Conflicts: # performance/Performance.Api/Template/医院绩效模板(无执行科室).xlsx # performance/Performance.Api/Template/医院绩效模板.xlsx # performance/Performance.Services/AllotCompute/ProcessComputService.cs # performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
李承祥 committed