Commits · ada982b1099775e58a6a4c288e0a5373c03b6746 · yangxiujun / paidan_demo · GitLab

07 Nov, 2023 3 commits
- fix:自动任务优化 · ada982b1
  Ren Ping committed Nov 07, 2023
  
  ada982b1
- fix:自动任务优化 · 757295ba
  Ren Ping committed Nov 07, 2023
  
  757295ba Browse Files
- fix:自动任务优化 · 685a6975
  Ren Ping committed Nov 07, 2023
  
  685a6975 Browse Files
06 Nov, 2023 37 commits
- Merge remote-tracking branch 'origin/develop' into develop · e86e80ad
  Ren Ping committed Nov 06, 2023
  
  e86e80ad Browse Files
- fix:自动任务优化 · e8cce6d9
  Ren Ping committed Nov 06, 2023
  
  e8cce6d9 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 530fee12
  huangjinxin committed Nov 06, 2023
  
  530fee12 Browse Files
- fix：意向时间调整 · 0c44c330
  huangjinxin committed Nov 06, 2023
  
  0c44c330 Browse Files
- Merge branch 'develop-16542' into 'develop' · 6d4701ee
```
Develop 16542

See merge request !367
```
  刘鑫 committed Nov 06, 2023
  6d4701ee Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · ea1a7384
  刘鑫 committed Nov 06, 2023
  
  ea1a7384 Browse Files
- doc(容量): 移除无用TODO 标签 · d6ff405e
  刘鑫 committed Nov 06, 2023
  
  d6ff405e Browse Files
- pref(工作队): 工作队人员添加校验信息周几数字更改为汉字 · 564157d7
  刘鑫 committed Nov 06, 2023
  
  564157d7 Browse Files
- fix(工程师日历): 工作队休息时间不再展示 · 4ffba494
  刘鑫 committed Nov 06, 2023
  
  4ffba494 Browse Files
- 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 Browse Files
- 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(工程师日历): 查询详情时字段校验添加详细描述信息 · 28df53fb
  刘鑫 committed Nov 06, 2023
  
  28df53fb Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop-16542 · 31686651
  刘鑫 committed Nov 06, 2023
  
  31686651 Browse Files
- fix(工作队添加人员): 工作队id取值错误 · f51823cf
  刘鑫 committed Nov 06, 2023
  
  f51823cf Browse Files
- fix：甘特图优化 · 400d8b6d
  huangjinxin committed Nov 06, 2023
  
  400d8b6d Browse Files
- 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 Browse Files
- 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 Browse Files
- fix(工作队添加人员): 工作队添加人员时进行校验 · b79800ef
  刘鑫 committed Nov 06, 2023
  
  b79800ef Browse Files
- feat(容量): 添加一个工程师挂多个工作队逻辑 · aa078d92
  刘鑫 committed Nov 06, 2023
  
  aa078d92 Browse Files
- 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 Browse Files
- 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