提交 · 3ce369eb621e292b070e6b6b90a37a280569606a · 姜武杰 / clx-performance

25 12月, 2023 21 次提交
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 3ce369eb
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: d5ded27f
```
  3ce369eb
- 修改结算单和违约结算单已结算的数据把结算失败原因置空 · 93f48944
  由 liuhaiquan 提交于 12月 25, 2023
  
  93f48944
- Merge remote-tracking branch 'origin/test' into test · 577f95f8
  由 liuhaiquan 提交于 12月 25, 2023
```
Former-commit-id: f7f4e378
```
  577f95f8
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 0aa44d04
  由 liuhaiquan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java


Former-commit-id: 3ece4629
```
  0aa44d04
- 修改结算单和违约结算单已结算的数据把结算失败原因置空 · 1e79421b
  由 liuhaiquan 提交于 12月 25, 2023
  
  1e79421b
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 0fc6ce8a
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 467de535
```
  0fc6ce8a
- 网络货运账户 · 03a3a50c
  由 huyufan 提交于 12月 25, 2023
  
  03a3a50c
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 4b8a2e7f
  由 huyufan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java


Former-commit-id: dba06d65
```
  4b8a2e7f
- 网络货运账户 · dcf9257b
  由 huyufan 提交于 12月 25, 2023
  
  dcf9257b
- 修改merge 错误 · d522be1f
  由 liuhaiquan 提交于 12月 25, 2023
  
  d522be1f
- Merge remote-tracking branch 'origin/master' into v6.5_transport_open_20231115 · 3d0450bb
  由 liuhaiquan 提交于 12月 25, 2023
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java
```
  3d0450bb
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · a673f91a
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 2071fffb
```
  a673f91a
- APP司机账户 · 3e6ef0d1
  由 huyufan 提交于 12月 25, 2023
  
  3e6ef0d1
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 1e10a434
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 0f10ea36
```
  1e10a434
- APP司机账户 · 67ef3ca4
  由 huyufan 提交于 12月 25, 2023
  
  67ef3ca4
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 71d94e97
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: dd362722
```
  71d94e97
- APP司机账户 · 0a3a824c
  由 huyufan 提交于 12月 25, 2023
  
  0a3a824c
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 05e39818
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: fa781e80
```
  05e39818
- APP司机账户 · c2d102ce
  由 huyufan 提交于 12月 25, 2023
  
  c2d102ce
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 6d74af5f
  由 huyufan 提交于 12月 25, 2023
```
Former-commit-id: 7193f645
```
  6d74af5f
- APP司机账户 · bf5dffcd
  由 huyufan 提交于 12月 25, 2023
  
  bf5dffcd
24 12月, 2023 10 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 517f88ef
  由 huyufan 提交于 12月 24, 2023
```
Former-commit-id: a6b75e3d
```
  517f88ef
- APP司机账户 · 71f7e46a
  由 huyufan 提交于 12月 24, 2023
  
  71f7e46a
- APP司机账户 · f6129377
  由 huyufan 提交于 12月 24, 2023
  
  f6129377
- APP司机账户 · c3107e52
  由 huyufan 提交于 12月 24, 2023
  
  c3107e52
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 16c57dc5
  由 huyufan 提交于 12月 24, 2023
```
Former-commit-id: b292e5e6
```
  16c57dc5
- APP司机账户 · a1606a8f
  由 huyufan 提交于 12月 24, 2023
  
  a1606a8f
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 8f0d33a1
  由 huyufan 提交于 12月 24, 2023
```
Former-commit-id: f0b9fc06
```
  8f0d33a1
- APP司机账户 · 793531d1
  由 huyufan 提交于 12月 24, 2023
  
  793531d1
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · b4b8b764
  由 huyufan 提交于 12月 24, 2023
```
Former-commit-id: cebcd444
```
  b4b8b764
- APP司机账户 · 6df7f6de
  由 huyufan 提交于 12月 24, 2023
  
  6df7f6de
22 12月, 2023 9 次提交
- Merge remote-tracking branch 'origin/test' into test · c084d435
  由 liuhaiquan 提交于 12月 22, 2023
```
Former-commit-id: e2cca61b
```
  c084d435
- Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test · 28d81da9
  由 liuhaiquan 提交于 12月 22, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java


Former-commit-id: 6e7dc242
```
  28d81da9
- 提交货单编辑剩余吨数可以为0的拦截 · 77f5a75d
  由 liuhaiquan 提交于 12月 22, 2023
  
  77f5a75d
- 提交货单编辑剩余吨数可以为0的拦截 · 823a50b7
  由 liuhaiquan 提交于 12月 22, 2023
  
  823a50b7
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · e5e4b0f8
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 7a9624b0
```
  e5e4b0f8
- APP司机账户 · 1635e3cb
  由 huyufan 提交于 12月 22, 2023
  
  1635e3cb
- Merge remote-tracking branch 'origin/test' into test · 649329a4
  由 liuhaiquan 提交于 12月 22, 2023
```
Former-commit-id: 0aabf626
```
  649329a4
- 修改merge冲突 · 2b40ea4e
  由 liuhaiquan 提交于 12月 22, 2023
```
Former-commit-id: 815fbfdc
```
  2b40ea4e
- Merge remote-tracking branch 'origin/test' into test · 82ea8f10
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 0f6e0316
```
  82ea8f10