提交 · 88a6f72cc32aaedc41957b3e2ae78d25ffccf577 · 姜武杰 / clx-performance

27 6月, 2024 9 次提交
- Merge remote-tracking branch 'origin/test' into test · 88a6f72c
  由刘海泉提交于 6月 27, 2024
```
Former-commit-id: 1f5d1f0f
```
  88a6f72c
- Merge remote-tracking branch 'origin/v17.3_youhua_20240615' into test · 087908db
  由刘海泉提交于 6月 27, 2024
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.java
#	performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java


Former-commit-id: 199ca352
```
  087908db
- 修改车队定向货单派单数的问题 · b49082c5
  由刘海泉提交于 6月 27, 2024
  
  b49082c5
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 583a74ea
  由艾庆国提交于 6月 27, 2024
```
Former-commit-id: bd25057f
```
  583a74ea
- 承运与无车承运对接 · f16a91a8
  由艾庆国提交于 6月 27, 2024
  
  f16a91a8
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 2ac9c2de
  由艾庆国提交于 6月 27, 2024
```
Former-commit-id: ffe22d99
```
  2ac9c2de
- 承运与无车承运对接 · 90ab3179
  由艾庆国提交于 6月 27, 2024
  
  90ab3179
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 85cc7776
  由艾庆国提交于 6月 27, 2024
```
Former-commit-id: 6f1b5429
```
  85cc7776
- 承运与无车承运对接 · e7aaf349
  由艾庆国提交于 6月 27, 2024
  
  e7aaf349
26 6月, 2024 31 次提交
- 取消货单 · c31d452e
  由李瑞鑫提交于 6月 26, 2024
  
  c31d452e
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · fb5b00e6
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: bc5f2adb
```
  fb5b00e6
- 承运与无车承运对接 · 9ef0b057
  由艾庆国提交于 6月 26, 2024
  
  9ef0b057
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · ddb235ed
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: c17523e9
```
  ddb235ed
- 承运与无车承运对接 · 9a9a0dc3
  由艾庆国提交于 6月 26, 2024
  
  9a9a0dc3
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 4baace04
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: e3dc00dc
```
  4baace04
- 承运与无车承运对接 · 8728ddcb
  由艾庆国提交于 6月 26, 2024
  
  8728ddcb
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · e839d725
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 1879cbfd
```
  e839d725
- 承运与无车承运对接 · 4935dad4
  由艾庆国提交于 6月 26, 2024
  
  4935dad4
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 3d250f7f
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 2a638295
```
  3d250f7f
- 承运与无车承运对接 · 3008b32b
  由艾庆国提交于 6月 26, 2024
  
  3008b32b
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · c6d2551a
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 7bec71c1
```
  c6d2551a
- 承运与无车承运对接 · fba423ea
  由艾庆国提交于 6月 26, 2024
  
  fba423ea
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 69ddc31c
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 4113503a
```
  69ddc31c
- 承运与无车承运对接 · b35bfff8
  由艾庆国提交于 6月 26, 2024
  
  b35bfff8
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 3dd0c3d8
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 2acdd15d
```
  3dd0c3d8
- 承运与无车承运对接 · 64675360
  由艾庆国提交于 6月 26, 2024
  
  64675360
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 9b913491
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 70bf2b12
```
  9b913491
- 承运与无车承运对接 · 1a677e73
  由艾庆国提交于 6月 26, 2024
  
  1a677e73
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 74d2f49a
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: fb8b177c
```
  74d2f49a
- 承运与无车承运对接 · 548761b7
  由艾庆国提交于 6月 26, 2024
  
  548761b7
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · de0fe918
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: df40a5ef
```
  de0fe918
- 承运与无车承运对接 · 124d5bc3
  由艾庆国提交于 6月 26, 2024
  
  124d5bc3
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · 612b03bf
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: 408ee383
```
  612b03bf
- 承运与无车承运对接 · 162a5a8f
  由艾庆国提交于 6月 26, 2024
  
  162a5a8f
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · e481416c
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: d3bd493e
```
  e481416c
- 承运与无车承运对接 · 819c087b
  由艾庆国提交于 6月 26, 2024
  
  819c087b
- 承运与无车承运对接 · 1ec587e1
  由艾庆国提交于 6月 26, 2024
  
  1ec587e1
- 承运与无车承运对接 · 69ec0570
  由艾庆国提交于 6月 26, 2024
  
  69ec0570
- Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test · f20ea255
  由艾庆国提交于 6月 26, 2024
```
Former-commit-id: f11ca520
```
  f20ea255
- 承运与无车承运对接 · 076c8a44
  由艾庆国提交于 6月 26, 2024
  
  076c8a44