Commits · e718deb7eee6f156194e3a09227518fc2a8e27ee · yangxiujun / paidan_demo

10 Jul, 2023 27 commits
- Merge branch 'feature-dingwf-0715' into develop · e718deb7
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/EngineerController.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
```
  丁伟峰 committed Jul 10, 2023
  e718deb7 Browse Files
- 技术员日历、技术员甘特图剥离到独立的service实现中 · 4363ef22
  丁伟峰 committed Jul 10, 2023
  
  4363ef22 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 32ba502e
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/EngineerController.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/EngineerServiceImpl.java
```
  丁伟峰 committed Jul 10, 2023
  32ba502e Browse Files
- 技术员日历实现 · 7217b709
  丁伟峰 committed Jul 10, 2023
  
  7217b709 Browse Files
- Merge branch 'dev_assign' into 'develop' · 46a5ecce
```
重命名

See merge request !179
```
  王力 committed Jul 10, 2023
  46a5ecce Browse Files
- 重命名 · 1d54846e
  wangli committed Jul 10, 2023
  
  1d54846e Browse Files
- Merge branch 'feature-dispatch-zx' into develop · a29bd11d
  张晓 committed Jul 10, 2023
  
  a29bd11d Browse Files
- fix bugs · 5464816e
  张晓 committed Jul 10, 2023
  
  5464816e Browse Files
- fix bugs · 60e7a79d
  张晓 committed Jul 10, 2023
  
  60e7a79d Browse Files
- Merge branch 'dev_assign' into 'develop' · 0f104389
```
Dev assign

See merge request !178
```
  王力 committed Jul 10, 2023
  0f104389 Browse Files
- 修改 · c0edaa58
  wangli committed Jul 10, 2023
  
  c0edaa58 Browse Files
- 修改 · 9f72d0fa
  wangli committed Jul 10, 2023
  
  9f72d0fa Browse Files
- 数据库新增字段 · 0521a0f4
  wangli committed Jul 10, 2023
  
  0521a0f4 Browse Files
- import project-dispatch · 11e31c19
  wangli committed Jul 10, 2023
  
  11e31c19 Browse Files
- Merge branch 'feature-dispatch-zx' into develop · 1d704a34
  张晓 committed Jul 10, 2023
  
  1d704a34 Browse Files
- debug batch · e16f06dc
  张晓 committed Jul 10, 2023
  
  e16f06dc
- Merge branch 'feature-dingwf-0715' into develop · 6025ee0c
  丁伟峰 committed Jul 10, 2023
  
  6025ee0c Browse Files
- bugfix:根据groupId查询 · a07b5a5d
  丁伟峰 committed Jul 10, 2023
  
  a07b5a5d Browse Files
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop · 1a09ae86
  张晓 committed Jul 10, 2023
  
  1a09ae86 Browse Files
- debug locationList · 5f0bc92b
  张晓 committed Jul 10, 2023
  
  5f0bc92b Browse Files
- localdatetime to json string · d5daba54
  张晓 committed Jul 10, 2023
  
  d5daba54 Browse Files
- 更新数据库配置 · 9037490e
  chamberone committed Jul 10, 2023
  
  9037490e Browse Files
- fix: 更新环境配置 · e97a8ae8
  chamberone committed Jul 10, 2023
  
  e97a8ae8 Browse Files
- feat: 提交测试代码 · 4e64e02a
  chamberone committed Jul 10, 2023
  
  4e64e02a Browse Files
- feat: 合并代码 · 68e3475f
  chamberone committed Jul 10, 2023
  
  68e3475f Browse Files
- feat: 代码重构，添加评分等工具 · 8c25ca0b
  chamberone committed Jul 10, 2023
  
  8c25ca0b
- 技术员技能组织调试 · 5e3c8af1
  张晓 committed Jul 10, 2023
  
  5e3c8af1 Browse Files
09 Jul, 2023 3 commits
- 新增sid · c38543aa
  wangli committed Jul 09, 2023
  
  c38543aa Browse Files
- Merge branch 'dev_assign' into 'develop' · c6d28c61
```
实现线段插入算法

See merge request !177
```
  王力 committed Jul 09, 2023
  c6d28c61 Browse Files
- 实现线段插入算法 · be3b0d0b
  wangli committed Jul 09, 2023
  
  be3b0d0b Browse Files
08 Jul, 2023 10 commits
- DTO优化，在原先response的class内部使用static class的基础上，在每一个DTO文件中，统一定义Request，Result · 417c9db4
  丁伟峰 committed Jul 08, 2023
  
  417c9db4 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 297620cd
```
# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java
#	project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java
#	project-order/src/main/java/com/dituhui/pea/order/service/WorkbenchService.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/CapacityQueryServiceImpl.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java
```
  丁伟峰 committed Jul 08, 2023
  297620cd Browse Files
- DTO优化，在原先response的class内部使用static class的基础上，在每一个DTO文件中，统一定义Request，Result · f4c7eb5a
  丁伟峰 committed Jul 08, 2023
  
  f4c7eb5a Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 475de1a6
  丁伟峰 committed Jul 08, 2023
  
  475de1a6 Browse Files
- 未上传字段的检查处理 · 18a07ac6
  丁伟峰 committed Jul 08, 2023
  
  18a07ac6 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · c19c0fae
  丁伟峰 committed Jul 08, 2023
  
  c19c0fae Browse Files
- update/delete需要在一个事务中：@Transactional · ce89da23
  丁伟峰 committed Jul 08, 2023
  
  ce89da23 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 3527ee04
  丁伟峰 committed Jul 08, 2023
  
  3527ee04 Browse Files
- 代码逻辑完善 · b9e1eff6
  丁伟峰 committed Jul 08, 2023
  
  b9e1eff6 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 8a7779a6
  丁伟峰 committed Jul 08, 2023
  
  8a7779a6 Browse Files