提交 · 4d16bc916e62026c7124a906c5c9b521a6d8b109 · 姜武杰 / clx-performance · GitLab

13 8月, 2024 40 次提交
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 4d16bc91
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 145752df
```
  4d16bc91
- 承运结算单优化-代码优化 · 63afad3a
  由艾庆国提交于 8月 13, 2024
  
  63afad3a
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 4e5a7b70
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 139eaad5
```
  4e5a7b70
- 承运结算单优化-代码优化 · 8fc17431
  由艾庆国提交于 8月 13, 2024
  
  8fc17431
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ffd2e405
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: c65f0acc
```
  ffd2e405
- Merge remote-tracking branch 'origin/test' into test · e6cb8783
  由 jiangwujie 提交于 8月 13, 2024
```
Former-commit-id: 57882307
```
  e6cb8783
- 承运结算单优化-代码优化 · e2595d86
  由艾庆国提交于 8月 13, 2024
  
  e2595d86
- Merge branch 'v21.1_jianzhuang_20240807' into test · d4c9b716
  由 jiangwujie 提交于 8月 13, 2024
```
Former-commit-id: df0abcfe
```
  d4c9b716
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ff98d2ab
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: fc13d204
```
  ff98d2ab
- 承运结算单优化-代码优化 · 0744b029
  由艾庆国提交于 8月 13, 2024
  
  0744b029
- feature(电子围栏): 如果从中交兴路无法获取数据，则从trace中获取卡车或者司机的位置来进行判断 · 48b62e2e
  由 jiangwujie 提交于 8月 13, 2024
  
  48b62e2e
- Merge remote-tracking branch 'origin/test' into test · 01ece61b
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: a899c0ee
```
  01ece61b
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · cd22568e
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: b1cb7876
```
  cd22568e
- 修改获取可提取吨数方法的逻辑计算 · d73c7767
  由刘海泉提交于 8月 13, 2024
  
  d73c7767
- 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
- 修改获取可提取吨数方法的逻辑计算 · de7b8313
  由刘海泉提交于 8月 13, 2024
  
  de7b8313
- 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