提交 · cdf9e6b0408209a6aca72428f7818a459227aecf · 姜武杰 / clx-performance

25 7月, 2024 20 次提交
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · cdf9e6b0
  由刘海泉提交于 7月 25, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java


Former-commit-id: c202191c
```
  cdf9e6b0
- 修改日志 · 96a3ce95
  由刘海泉提交于 7月 25, 2024
  
  96a3ce95
- commit · 7f79963f
  由刘海泉提交于 7月 25, 2024
  
  7f79963f
- commit · 188abcfd
  由刘海泉提交于 7月 25, 2024
  
  188abcfd
- master合并分支 · efe05a2b
  由李瑞鑫提交于 7月 25, 2024
  
  efe05a2b
- Merge branch 'master' into v19.4_order_performance_progress_20240712 · 493752e4
  由李瑞鑫提交于 7月 25, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
```
  493752e4
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 8de60aec
  由刘海泉提交于 7月 25, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java


Former-commit-id: d9564cfe
```
  8de60aec
- commit · 4fdd1422
  由刘海泉提交于 7月 25, 2024
  
  4fdd1422
- commit · ef8c4e8f
  由刘海泉提交于 7月 25, 2024
  
  ef8c4e8f
- 修改履约进度表更新问题 · 229d6bfb
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: f9ecfd0e
```
  229d6bfb
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 93fe06ff
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: a18a2488
```
  93fe06ff
- 修改履约进度表完成率修改 · 66bf1003
  由刘海泉提交于 7月 25, 2024
  
  66bf1003
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 8d7236b6
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: b440340a
```
  8d7236b6
- 修改履约进度表完成率修改 · 41f09603
  由刘海泉提交于 7月 25, 2024
  
  41f09603
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 8cf97131
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: c6406ddb
```
  8cf97131
- 修改履约进度表完成率修改 · 3ad8279b
  由刘海泉提交于 7月 25, 2024
  
  3ad8279b
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 763be705
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: 2a52876b
```
  763be705
- 接单率实时计算，增加接单吨数字段实时统计 · e6e0c08f
  由刘海泉提交于 7月 25, 2024
  
  e6e0c08f
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 7301db76
  由刘海泉提交于 7月 25, 2024
```
Former-commit-id: 4a2ec045
```
  7301db76
- 修改接单率和完成率比例值的问题 · 2bfbdbf0
  由刘海泉提交于 7月 25, 2024
  
  2bfbdbf0
24 7月, 2024 4 次提交
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 2f3d6542
  由刘海泉提交于 7月 24, 2024
```
Former-commit-id: c36ca86b
```
  2f3d6542
- 兼容前端时间组件不选择传空的问题 · e8eef8f6
  由刘海泉提交于 7月 24, 2024
  
  e8eef8f6
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 4e128d84
  由刘海泉提交于 7月 24, 2024
```
Former-commit-id: 77851284
```
  4e128d84
- 当运单、货单取消之后，需要重新计算对应该订单的接单率 · 601194c7
  由刘海泉提交于 7月 24, 2024
  
  601194c7
23 7月, 2024 9 次提交
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 1dd01cf5
  由刘海泉提交于 7月 23, 2024
```
Former-commit-id: ef59b739
```
  1dd01cf5
- 修改枚举备注错误的问题 · b5059be2
  由刘海泉提交于 7月 23, 2024
  
  b5059be2
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 9bdfaa2a
  由刘海泉提交于 7月 23, 2024
```
Former-commit-id: 4d25d263
```
  9bdfaa2a
- 修改日志生成类型错误的问题 · 1e6203e8
  由刘海泉提交于 7月 23, 2024
  
  1e6203e8
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 04a9acab
  由刘海泉提交于 7月 23, 2024
```
Former-commit-id: 165a9c3f
```
  04a9acab
- 修改履约进度表调价记录生成条件判断 · 81ffe476
  由刘海泉提交于 7月 23, 2024
  
  81ffe476
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · 6487bdf8
  由刘海泉提交于 7月 23, 2024
```
Former-commit-id: 9d6300c0
```
  6487bdf8
- 修改测试问题 · 5b526ccc
  由刘海泉提交于 7月 23, 2024
  
  5b526ccc
- 修改测试问题 · 3c3b5cc1
  由刘海泉提交于 7月 23, 2024
  
  3c3b5cc1
22 7月, 2024 7 次提交
- Merge remote-tracking branch 'origin/test' into test · 78d42901
  由刘海泉提交于 7月 22, 2024
```
Former-commit-id: 18b22730
```
  78d42901
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · a98c32c3
  由刘海泉提交于 7月 22, 2024
```
Former-commit-id: bc359d81
```
  a98c32c3
- 代码code优化 · 8d10ed29
  由刘海泉提交于 7月 22, 2024
  
  8d10ed29
- Merge branch 'v19.6_carrier_optimization_20240717' into test · 5d1bd383
  由李瑞鑫提交于 7月 22, 2024
```
Former-commit-id: 30458de4
```
  5d1bd383
- 修改装车吨数，货单列表中已装车吨数未同步变更 · e394abbe
  由李瑞鑫提交于 7月 22, 2024
  
  e394abbe
- Merge remote-tracking branch 'origin/test' into test · 70c45e82
  由刘海泉提交于 7月 22, 2024
```
Former-commit-id: 5a1d6415
```
  70c45e82
- Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into test · a2165a0e
  由刘海泉提交于 7月 22, 2024
```
Former-commit-id: 3913b690
```
  a2165a0e