Skip to content

P
performance
Switch branch/tag
  1. 22 Jul, 2021 1 commit
  3. 21 Jul, 2021 8 commits
  5. 20 Jul, 2021 8 commits
  7. 19 Jul, 2021 8 commits
  9. 15 Jul, 2021 3 commits
  11. 14 Jul, 2021 4 commits
  13. 13 Jul, 2021 2 commits
  15. 12 Jul, 2021 4 commits
  17. 09 Jul, 2021 2 commits
    • Merge branch 'feature/新二次分配' into release/v20210709功能分支合并 · 088ac466 
      # Conflicts:
#	performance/Performance.Api/appsettings.Localhost.json
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.DtoModels/HandsonTable.cs
#	performance/Performance.DtoModels/PerExcel/ExcelEnum.cs
#	performance/Performance.Services/SecondAllotService.cs
      lcx committed
    • Merge branch 'feature/划拨' into release/v20210709功能分支合并 · 645e117f 
      # Conflicts:
#	performance/Performance.Api/wwwroot/Performance.DtoModels.xml
#	performance/Performance.Api/wwwroot/Performance.EntityModels.xml
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
#	performance/Performance.EntityModels/Context/PerformanceDbContext.cs
#	performance/Performance.EntityModels/Entity/cof_alias.cs
#	performance/Performance.EntityModels/Entity/per_employee.cs
#	performance/Performance.EntityModels/Entity/res_compute.cs
      lcx committed