提交 · 85d9706d0b9bf62662a577f47a748ea52972990f · 姜武杰 / clx-performance

24 10月, 2024 4 次提交
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 85d9706d
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: 68163544
```
  85d9706d
- 修改线路重新计算历史运费 · 6b0d1fec
  由刘海泉提交于 10月 24, 2024
  
  6b0d1fec
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 6ee7cd10
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: 6637ff62
```
  6ee7cd10
- 修改线路重新计算历史运费 · 07863ab8
  由刘海泉提交于 10月 24, 2024
  
  07863ab8
23 10月, 2024 14 次提交
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · d5652f16
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: d94e4fca
```
  d5652f16
- 修改更新历史线路的历史运费 · fab6ef30
  由刘海泉提交于 10月 23, 2024
  
  fab6ef30
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 52e736df
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: 85807e53
```
  52e736df
- 导出增加百分号 · a1761f8f
  由刘海泉提交于 10月 23, 2024
  
  a1761f8f
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · a8c8bef4
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: 4987dbb3
```
  a8c8bef4
- 计算运费和历史运费 · 0a2c71c8
  由刘海泉提交于 10月 23, 2024
  
  0a2c71c8
- 计算运费和历史运费 · 498d6f81
  由刘海泉提交于 10月 23, 2024
  
  498d6f81
- 计算运费和历史运费 · 2a085e74
  由刘海泉提交于 10月 23, 2024
  
  2a085e74
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 538daea8
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: ed17bf8b
```
  538daea8
- 修改挂单运费相关问题 · 55584408
  由刘海泉提交于 10月 23, 2024
  
  55584408
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 5158ccb9
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: 9211ac74
```
  5158ccb9
- 修改导出金额扩大100倍的问题 · 12e49130
  由刘海泉提交于 10月 23, 2024
  
  12e49130
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · c189e5ad
  由刘海泉提交于 10月 23, 2024
```
Former-commit-id: 1d4e5f10
```
  c189e5ad
- 修改运费金额扩大100倍的问题 · a10802fa
  由刘海泉提交于 10月 23, 2024
  
  a10802fa
22 10月, 2024 7 次提交
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 81a40300
  由刘海泉提交于 10月 22, 2024
```
Former-commit-id: f0ad2663
```
  81a40300
- 增加日志 · 7ddd7234
  由刘海泉提交于 10月 22, 2024
  
  7ddd7234
- 修改挂单运费的历史运费和平均运费的计算 · b151f812
  由刘海泉提交于 10月 22, 2024
  
  b151f812
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 2cfd529f
  由刘海泉提交于 10月 22, 2024
```
Former-commit-id: f009a090
```
  2cfd529f
- 修改热值字段 · 4ddc7fd8
  由刘海泉提交于 10月 22, 2024
  
  4ddc7fd8
- merge · ded785c4
  由刘海泉提交于 10月 22, 2024
```
Former-commit-id: 60ef83c4
```
  ded785c4
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 56aa4a93
  由刘海泉提交于 10月 22, 2024
```
# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	clx-performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java


Former-commit-id: 926a4186
```
  56aa4a93
21 10月, 2024 9 次提交
- 提交挂单运费相关代码 · e914a41b
  由刘海泉提交于 10月 21, 2024
  
  e914a41b
- 增加挂单运费列表和导出接口 · 37f41811
  由刘海泉提交于 10月 21, 2024
  
  37f41811
- Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17 · c372247d
  由刘海泉提交于 10月 21, 2024
```
Former-commit-id: 98825f08
```
  c372247d
- 增加取消的判断挂单车数的逻辑 · d9cf14b6
  由刘海泉提交于 10月 21, 2024
  
  d9cf14b6
- 修改导出字段 · cedb0829
  由刘海泉提交于 10月 21, 2024
  
  cedb0829
- Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17 · 4b34ff35
  由刘海泉提交于 10月 21, 2024
```
Former-commit-id: 33923275
```
  4b34ff35
- 修改履约进度表修改挂单车数计算逻辑 · 6f433af2
  由刘海泉提交于 10月 21, 2024
  
  6f433af2
- 新增挂单运费页面接口 · f30e57ae
  由刘海泉提交于 10月 21, 2024
  
  f30e57ae
- 新增挂单运费页面接口 · 78cafb60
  由刘海泉提交于 10月 21, 2024
  
  78cafb60
18 10月, 2024 6 次提交
- Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17 · 5ca01445
  由刘海泉提交于 10月 18, 2024
```
Former-commit-id: ec160e68
```
  5ca01445
- 修改挂单车数的计算 · 4e4bd093
  由刘海泉提交于 10月 18, 2024
  
  4e4bd093
- Merge remote-tracking branch 'origin/v28.8_carrier_exercise_optimization_20241010' into test_jdk17 · 2a79c212
  由刘海泉提交于 10月 18, 2024
```
Former-commit-id: fff2dc05
```
  2a79c212
- 修改货单取消状态和需要车数和提取吨数的更新 · d2e45767
  由刘海泉提交于 10月 18, 2024
  
  d2e45767
- 增加挂单运费相关代码 · b58df0d0
  由刘海泉提交于 10月 18, 2024
  
  b58df0d0
- 履约服务中交兴路调用问题解决 · a1faa698
  由姜武杰提交于 10月 18, 2024
```
Former-commit-id: a3be08eb
```
  a1faa698