Commits · edeb31c7a1658df0b25e45b4c554d81cc47e4822 · yangxiujun / paidan_demo · GitLab

06 Nov, 2023 25 commits
- Merge remote-tracking branch 'origin/develop' into develop · edeb31c7
  huangjinxin committed Nov 06, 2023
  
  edeb31c7 Browse Files
- fix：工单备注 · 31bb1b59
  huangjinxin committed Nov 06, 2023
  
  31bb1b59
- Merge remote-tracking branch 'origin/develop' into develop · 9365265a
  Ren Ping committed Nov 06, 2023
  
  9365265a Browse Files
- fix:自动任务优化 · 17cee30c
  Ren Ping committed Nov 06, 2023
  
  17cee30c Browse Files
- fix：工单备注 · 7414a57c
  huangjinxin committed Nov 06, 2023
  
  7414a57c Browse Files
- fix：接口列表查询bug · 90bc681c
  huangjinxin committed Nov 06, 2023
  
  90bc681c Browse Files
- fix：甘特图优化 · 400d8b6d
  huangjinxin committed Nov 06, 2023
  
  400d8b6d
- Merge remote-tracking branch 'origin/develop' into develop · ee9fc420
  huangjinxin committed Nov 06, 2023
  
  ee9fc420 Browse Files
- fix：bean组织机构数据同步，工单一家多单分组优化 · 9d156871
  huangjinxin committed Nov 06, 2023
  
  9d156871
- Merge remote-tracking branch 'origin/develop' into develop · 028b12b4
  Ren Ping committed Nov 06, 2023
  
  028b12b4 Browse Files
- fix:排班结果工程师详情修改 · 458c8875
  Ren Ping committed Nov 06, 2023
  
  458c8875 Browse Files
- Merge branch 'develop-16542' into 'develop' · 8cb9e567
```
Develop 16542

See merge request !366
```
  刘鑫 committed Nov 06, 2023
  8cb9e567 Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · 9f35b44d
  刘鑫 committed Nov 06, 2023
  
  9f35b44d Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · 5895f967
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/dto/ScheduleEngineerOverviewResp.java
```
  刘鑫 committed Nov 06, 2023
  5895f967 Browse Files
- fix:排班结果工程师详情修改 · e171ae61
  Ren Ping committed Nov 06, 2023
  
  e171ae61
- fix(工作队添加人员): 工作队添加人员时进行校验 · b79800ef
  刘鑫 committed Nov 06, 2023
  
  b79800ef
- feat(容量): 添加一个工程师挂多个工作队逻辑 · aa078d92
  刘鑫 committed Nov 06, 2023
  
  aa078d92
- fix:排班结果工程师详情修改 · d28fc44a
  Ren Ping committed Nov 06, 2023
  
  d28fc44a Browse Files
- fix:排班结果工程师详情修改 · c3266f4a
  Ren Ping committed Nov 06, 2023
  
  c3266f4a Browse Files
- fix:排班结果工程师详情修改 · 37029958
  Ren Ping committed Nov 06, 2023
  
  37029958
- fix(容量):最大空闲时间空指针处理 · d3450601
  刘鑫 committed Nov 06, 2023
  
  d3450601 Browse Files
- fix(容量):最大空闲时间计算不能直接取对应枚举 · 9739deeb
  刘鑫 committed Nov 06, 2023
  
  9739deeb Browse Files
- fix(容量):最大空闲时间计算不能直接取对应枚举 · c1ead991
  刘鑫 committed Nov 06, 2023
  
  c1ead991 Browse Files
- fix:排班结果工程师详情修改 · d9b4a449
  Ren Ping committed Nov 06, 2023
  
  d9b4a449 Browse Files
- fix:排班结果工程师详情修改 · 401a767b
  Ren Ping committed Nov 06, 2023
  
  401a767b Browse Files
03 Nov, 2023 12 commits
- feat:任务执行分布式改造 · 013a03db
  Ren Ping committed Nov 03, 2023
  
  013a03db Browse Files
- feat:任务执行分布式 · f1b376d5
  Ren Ping committed Nov 03, 2023
  
  f1b376d5 Browse Files
- feat:任务执行分布式 · 51c8cab8
  Ren Ping committed Nov 03, 2023
  
  51c8cab8
- Merge branch 'develop-16542' into 'develop' · ae692a05
```
Develop 16542

See merge request !365
```
  刘鑫 committed Nov 03, 2023
  ae692a05 Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · aae7ca0e
  刘鑫 committed Nov 03, 2023
  
  aae7ca0e Browse Files
- fix(平台内改约容量接口分区匹配功能): 更改sass 匹配区划功能实现 · 8ddbdcbe
  刘鑫 committed Nov 03, 2023
  
  8ddbdcbe
- fix(容量时间片计算添加多工作队支持): 容量时间片计算添加单人多工作队支持 · b57d5895
  刘鑫 committed Nov 03, 2023
  
  b57d5895
- fix：工单一家多单分组优化 · a83361a3
  huangjinxin committed Nov 03, 2023
  
  a83361a3 Browse Files
- fix：工单紧急正常分组优化 · ccadbac7
  huangjinxin committed Nov 03, 2023
  
  ccadbac7 Browse Files
- fix：指派工程师返回名称 · 8c47b6ec
  huangjinxin committed Nov 03, 2023
  
  8c47b6ec
- fix：不允许改约到当前时间之前 · a64f3bc9
  huangjinxin committed Nov 03, 2023
  
  a64f3bc9
- fix：指定工程师，取消工单相关 · b814811a
  huangjinxin committed Nov 03, 2023
  
  b814811a
02 Nov, 2023 3 commits
- test(并集时间运算): 时并集运算极端情况测试 · 99978b2e
  刘鑫 committed Nov 02, 2023
  
  99978b2e Browse Files
- Merge branch 'develop-16542' into 'develop' · 23fe6c5a
```
容量  交集并集运算

See merge request !364
```
  刘鑫 committed Nov 02, 2023
  23fe6c5a Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · e24874d9
  刘鑫 committed Nov 02, 2023
  
  e24874d9 Browse Files