提交 · 10118b4dd677d339854655cd0e55ba20128bc7b9 · 姜武杰 / clx-performance

07 8月, 2024 4 次提交
- Merge branch 'refs/heads/v20.4_exception_report_20240802' into test · 10118b4d
  由杨启发提交于 8月 07, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java


Former-commit-id: 6fef440d
```
  10118b4d
- 运输异常上报 · be4eb335
  由杨启发提交于 8月 07, 2024
  
  be4eb335
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · 8c931d43
  由李瑞鑫提交于 8月 07, 2024
```
Former-commit-id: 19d3f10b
```
  8c931d43
- 拉取电子磅单图片 · 96e74fab
  由李瑞鑫提交于 8月 07, 2024
  
  96e74fab
06 8月, 2024 23 次提交
- Merge remote-tracking branch 'origin/test' into test · 2f363de5
  由杨启发提交于 8月 06, 2024
```
Former-commit-id: ea066af1
```
  2f363de5
- 运输异常上报 · 6623f001
  由杨启发提交于 8月 06, 2024
```
Former-commit-id: ff186494
```
  6623f001
- Merge remote-tracking branch 'origin/test' into test · b9be261a
  由 jiangwujie 提交于 8月 06, 2024
```
Former-commit-id: 141b801f
```
  b9be261a
- Merge branch 'v20.3-yundan-renzheng-0730' into test · c72e65a9
  由 jiangwujie 提交于 8月 06, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.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


Former-commit-id: 53c5d551
```
  c72e65a9
- fix(货单、认证): 修复运单发货-是否需要系统排队发货-排队系统形式未展示的问题 · 36594cbb
  由 jiangwujie 提交于 8月 06, 2024
```
Former-commit-id: 3e926811
```
  36594cbb
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · 1f0c867c
  由李瑞鑫提交于 8月 06, 2024
```
Former-commit-id: 29f8d4fc
```
  1f0c867c
- 拉取电子磅单图片 · daea7398
  由李瑞鑫提交于 8月 06, 2024
  
  daea7398
- Merge remote-tracking branch 'origin/test' into test · fd0d2516
  由杨启发提交于 8月 06, 2024
```
Former-commit-id: 94225067
```
  fd0d2516
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · b1ead01d
  由李瑞鑫提交于 8月 06, 2024
```
Former-commit-id: efcf5965
```
  b1ead01d
- Merge branch 'refs/heads/v20.4_exception_report_20240802' into test · e0e5f58b
  由杨启发提交于 8月 06, 2024
```
Former-commit-id: 3e3a510a
```
  e0e5f58b
- 拉取电子磅单图片 · b98ee0c4
  由李瑞鑫提交于 8月 06, 2024
  
  b98ee0c4
- Merge remote-tracking branch 'origin/test' into test · 7ce82865
  由李瑞鑫提交于 8月 06, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java


Former-commit-id: 3b55bfd5
```
  7ce82865
- Merge remote-tracking branch 'origin/v21.1_bug_performance_progress_20240806' into test · 26f87279
  由刘海泉提交于 8月 06, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.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


Former-commit-id: ca9a76dc
```
  26f87279
- 修改履约进度表列表报错的问题 · 8ab6f9bf
  由刘海泉提交于 8月 06, 2024
  
  8ab6f9bf
- merge(货单、认证): merge master to current branch · 6ff5cd7f
  由 jiangwujie 提交于 8月 06, 2024
```
Former-commit-id: d3d8a97a
```
  6ff5cd7f
- fix(货单、认证): 去除注释 · c23389ee
  由 jiangwujie 提交于 8月 06, 2024
```
Former-commit-id: 244f45e1
```
  c23389ee
- Merge remote-tracking branch 'origin/test' into test · 73dfeeb8
  由李瑞鑫提交于 8月 06, 2024
```
Former-commit-id: 91543670
```
  73dfeeb8
- 拉取电子磅单图片 · 47d25f99
  由李瑞鑫提交于 8月 06, 2024
```
Former-commit-id: e6d4ffb1
```
  47d25f99
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · 1bb3958a
  由李瑞鑫提交于 8月 06, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.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


Former-commit-id: 66176d62
```
  1bb3958a
- fix(货单、认证): 修复货单详情是否需要排队展示错误问题 · 60e4eb7c
  由 jiangwujie 提交于 8月 06, 2024
```
Former-commit-id: 1a54ecfb
```
  60e4eb7c
- feature(货单、认证): 调整枚举 · dd842512
  由 jiangwujie 提交于 8月 05, 2024
```
Former-commit-id: 8c1d72f1
```
  dd842512
- 拉取电子磅单图片 · 0ea9170e
  由李瑞鑫提交于 8月 06, 2024
  
  0ea9170e
- 拉取电子磅单图片 · 6a667faf
  由李瑞鑫提交于 8月 06, 2024
  
  6a667faf
05 8月, 2024 5 次提交
- feature(货单、认证): 增加日志调试 · e6a8cd50
  由 jiangwujie 提交于 8月 05, 2024
```
Former-commit-id: 3fae8736
```
  e6a8cd50
- feature(货单、认证): 调整车主判断逻辑，原来是使用司机钱包和卡车钱包进行比较，现在用当前登录用户userno和车主userno进行比较 · fd788619
  由 jiangwujie 提交于 8月 05, 2024
```
Former-commit-id: 07e260cf
```
  fd788619
- Merge branch 'v20.3-yundan-renzheng-0730' into test · fdd4fc58
  由 jiangwujie 提交于 8月 05, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: c9675928
```
  fdd4fc58
- feature(货单、认证): 调整车主判断逻辑，原来是使用司机钱包和卡车钱包进行比较，现在用当前登录用户userno和车主userno进行比较 · 70f5988b
  由 jiangwujie 提交于 8月 05, 2024
  
  70f5988b
- feature(货单、认证): 增加日志排查钱包信息 · 7952b321
  由 jiangwujie 提交于 8月 05, 2024
```
Former-commit-id: 4217e35a
```
  7952b321
03 8月, 2024 6 次提交
- Merge branch 'v20.3-yundan-renzheng-0730' into test · 9eb237e9
  由 jiangwujie 提交于 8月 03, 2024
```
Former-commit-id: a2701f85
```
  9eb237e9
- feature(货单、认证): 增加判空 · 9dfaf8b0
  由 jiangwujie 提交于 8月 03, 2024
  
  9dfaf8b0
- Merge branch 'v20.3-yundan-renzheng-0730' into test · a86c0404
  由 jiangwujie 提交于 8月 03, 2024
```
Former-commit-id: 8fee01d1
```
  a86c0404
- feature(货单、认证): 是否需要系统排队排队系统形式增加描述字段 · 5802dd50
  由 jiangwujie 提交于 8月 03, 2024
  
  5802dd50
- feature(货单、认证): 合并 test · cf890f72
  由 jiangwujie 提交于 8月 03, 2024
```
Former-commit-id: b1689ca2
```
  cf890f72
- 异常上报 · 2349245e
  由杨启发提交于 8月 03, 2024
  
  2349245e
02 8月, 2024 2 次提交
- 异常上报 · 38b891a9
  由杨启发提交于 8月 02, 2024
  
  38b891a9
- 拉取电子磅单图片 · d992bd5b
  由李瑞鑫提交于 8月 02, 2024
  
  d992bd5b