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

13 8月, 2024 27 次提交
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 3b29b6c7
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: e27e4f79
```
  3b29b6c7
- 承运结算单优化-代码优化 · 81dc7ecb
  由艾庆国提交于 8月 13, 2024
  
  81dc7ecb
- 承运结算单优化-代码优化 · e094a4d2
  由艾庆国提交于 8月 13, 2024
  
  e094a4d2
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 3565bc56
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: bacbf692
```
  3565bc56
- 承运结算单优化-代码优化 · 569c737a
  由艾庆国提交于 8月 13, 2024
  
  569c737a
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 04bb6a5d
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: a9161e92
```
  04bb6a5d
- 承运结算单优化-修改枚举定义 · beffecda
  由艾庆国提交于 8月 13, 2024
  
  beffecda
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 204f205c
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: dd0a5cd1
```
  204f205c
- 承运结算单优化-修改枚举定义 · db8d23e8
  由艾庆国提交于 8月 13, 2024
  
  db8d23e8
- Merge remote-tracking branch 'origin/test' into test · 88625651
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: 93803ea1
```
  88625651
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 77145ffa
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: 7189127d
```
  77145ffa
- 修改货单取消更新失败的问题 · e6b5cd45
  由刘海泉提交于 8月 13, 2024
  
  e6b5cd45
- Merge remote-tracking branch 'origin/test' into test · 66b8acfa
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: a88295f2
```
  66b8acfa
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 11bd9ae1
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: a655c7ea
```
  11bd9ae1
- Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · afc6f6ba
  由杨启发提交于 8月 13, 2024
  
  afc6f6ba
- 结算单优化 · a52fb2c9
  由杨启发提交于 8月 13, 2024
  
  a52fb2c9
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 7c176b5b
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: bad1acf9
```
  7c176b5b
- 承运结算单优化-修改枚举定义 · f7953130
  由艾庆国提交于 8月 13, 2024
  
  f7953130
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · f8377b83
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: 74711034
```
  f8377b83
- Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · d7c43fe8
  由杨启发提交于 8月 13, 2024
  
  d7c43fe8
- 结算单优化 · 5e4ce0ad
  由杨启发提交于 8月 13, 2024
  
  5e4ce0ad
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · f770219d
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 2b30447c
```
  f770219d
- 承运结算单优化-同步无车承运运费计算公式变更 · ece9beb6
  由艾庆国提交于 8月 13, 2024
  
  ece9beb6
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 7f83749b
  由刘海泉提交于 8月 13, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java


Former-commit-id: 50c0e5dc
```
  7f83749b
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · d41051a7
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: d74c5b1c
```
  d41051a7
- 结算单优化 · 7a9c9039
  由杨启发提交于 8月 13, 2024
  
  7a9c9039
- 修改接单详情报错的问题 · 19888ca0
  由刘海泉提交于 8月 13, 2024
  
  19888ca0
12 8月, 2024 13 次提交
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 427b6388
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: ec30f690
```
  427b6388
- 修改批量取消报错的问题 · c070a912
  由刘海泉提交于 8月 12, 2024
  
  c070a912
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · d3c5f548
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: a0331cc5
```
  d3c5f548
- 修改批量取消报错的问题 · a33c8571
  由刘海泉提交于 8月 12, 2024
  
  a33c8571
- Merge remote-tracking branch 'origin/test' into test · f6559b6e
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 5d8bd0f9
```
  f6559b6e
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 7fa675a8
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 5370a123
```
  7fa675a8
- merge to test · ad4fd014
  由 jiangwujie 提交于 8月 12, 2024
```
Former-commit-id: d37112c5
```
  ad4fd014
- 修改批量取消报错的问题 · 2ac5fa59
  由刘海泉提交于 8月 12, 2024
  
  2ac5fa59
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 53e4e8e4
  由艾庆国提交于 8月 12, 2024
```
Former-commit-id: 27b0d0e6
```
  53e4e8e4
- 承运结算单优化 · 149d5d3f
  由艾庆国提交于 8月 12, 2024
  
  149d5d3f
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 1c13f71f
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 53339e28
```
  1c13f71f
- 修改吨数计算 · 66474170
  由刘海泉提交于 8月 12, 2024
  
  66474170
- Merge remote-tracking branch 'origin/test' into test · 0fba4ce1
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: d14da591
```
  0fba4ce1