Commits · 9ed7205bf31532ff84160b50b2f3c7b5372ab038 · yangxiujun / paidan_demo · GitLab

11 Jul, 2023 19 commits
- Merge branch 'dev_order_detail' into 'develop' · 9ed7205b
```
Dev order detail

See merge request !187
```
  王力 committed Jul 11, 2023
  9ed7205b Browse Files
- 新增返回接口 · 472f446a
  wangli committed Jul 11, 2023
  
  472f446a Browse Files
- 新增接口返回参数 · f5759bc9
  wangli committed Jul 11, 2023
  
  f5759bc9 Browse Files
- 新增LocalDate2String方法 · 0897b4f5
  wangli committed Jul 11, 2023
  
  0897b4f5 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 9a39a37b
  丁伟峰 committed Jul 11, 2023
  
  9a39a37b Browse Files
- 更新保存前，需要有id，否则会当做插入处理 · fe78a284
  丁伟峰 committed Jul 11, 2023
  
  fe78a284 Browse Files
- 限制返回status=1的记录 · 694d3c10
  丁伟峰 committed Jul 11, 2023
  
  694d3c10 Browse Files
- Merge branch 'dev_assign' into 'develop' · a843b391
```
修改

See merge request !186
```
  王力 committed Jul 11, 2023
  a843b391 Browse Files
- 修改 · c4cb56c3
  wangli committed Jul 11, 2023
  
  c4cb56c3 Browse Files
- Merge branch 'dev_assign' into 'develop' · 4f7fc73d
```
修改

See merge request !185
```
  王力 committed Jul 11, 2023
  4f7fc73d Browse Files
- 修改 · b1c0b9d6
  wangli committed Jul 11, 2023
  
  b1c0b9d6 Browse Files
- Merge branch 'dev_assign' into 'develop' · dd709610
```
Dev assign

See merge request !184
```
  王力 committed Jul 11, 2023
  dd709610 Browse Files
- 新增实现放回工单池 · 390620f2
  wangli committed Jul 11, 2023
  
  390620f2 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 8f19fc45
  丁伟峰 committed Jul 11, 2023
  
  8f19fc45 Browse Files
- 格式化代码 · 6504e337
  wangli committed Jul 11, 2023
  
  6504e337 Browse Files
- 修订完善 · 36a3fcc5
  丁伟峰 committed Jul 11, 2023
  
  36a3fcc5 Browse Files
- 返回 group相关字段，前端需要使用 · 40ed9bc5
  丁伟峰 committed Jul 11, 2023
  
  40ed9bc5 Browse Files
- 新增Select · 9116a6e8
  wangli committed Jul 11, 2023
  
  9116a6e8
- 新增接口请求参数DTO · 39e51d8e
  wangli committed Jul 11, 2023
  
  39e51d8e Browse Files
10 Jul, 2023 21 commits
- Merge branch 'feature-dingwf-0715' into develop · 012f75ff
  丁伟峰 committed Jul 11, 2023
  
  012f75ff Browse Files
- bugfix · 363a2da2
  丁伟峰 committed Jul 11, 2023
  
  363a2da2 Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 54ef115b
  丁伟峰 committed Jul 10, 2023
  
  54ef115b Browse Files
- 强制为 hh🇲🇲ss · 416c70bb
  丁伟峰 committed Jul 10, 2023
  
  416c70bb Browse Files
- Merge branch 'feature-dingwf-0715' into develop · 1f0ed440
  丁伟峰 committed Jul 10, 2023
  
  1f0ed440 Browse Files
- bugfix · aeb73a76
  丁伟峰 committed Jul 10, 2023
  
  aeb73a76 Browse Files
- fix · 8010a744
  丁伟峰 committed Jul 10, 2023
  
  8010a744 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · a9172314
  丁伟峰 committed Jul 10, 2023
  
  a9172314 Browse Files
- 技术员日历、技术员甘特图剥离到独立的service实现中 · f66f8cf9
  丁伟峰 committed Jul 10, 2023
  
  f66f8cf9
- 技术员日历、技术员甘特图剥离到独立的service实现中 · 5706bb32
  丁伟峰 committed Jul 10, 2023
  
  5706bb32 Browse Files
- 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 'feature-dispatch-zx' into develop · 7d168256
  张晓 committed Jul 10, 2023
  
  7d168256 Browse Files
- fix bugs · cc00a640
  张晓 committed Jul 10, 2023
  
  cc00a640 Browse Files
- Merge branch 'feature-dispatch-zx' into develop · 93bd47f2
  张晓 committed Jul 10, 2023
  
  93bd47f2 Browse Files
- fix bugs · c24ffade
  张晓 committed Jul 10, 2023
  
  c24ffade Browse Files
- Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr… · baf13f7e
```
…oject.git into develop
```
  chamberone committed Jul 10, 2023
  baf13f7e Browse Files
- Merge branch 'develop' of · 21ba9086
```
https://zhangguoping@gitlab.dituhui.com/bsh/project/project.git into
develop
```
  chamberone committed Jul 10, 2023
  21ba9086
- Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop · e7280472
  张晓 committed Jul 10, 2023
  
  e7280472 Browse Files