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

29 8月, 2024 7 次提交
- Merge branch 'v23.7_export_performance_progress_20240829' into test · bc8c6616
  由杨启发提交于 8月 29, 2024
```
Former-commit-id: d5d2472f
```
  bc8c6616
- 导出履约进度 · 2eea688a
  由杨启发提交于 8月 29, 2024
  
  2eea688a
- 导出履约进度 · 4b936d82
  由杨启发提交于 8月 29, 2024
  
  4b936d82
- 导出履约进度 · af4f8ebb
  由杨启发提交于 8月 29, 2024
  
  af4f8ebb
- feat(sdk)：调试sdk调用报错的问题 · b5d36f43
  由 jiangwujie 提交于 8月 29, 2024
```
Former-commit-id: aa462e73
```
  b5d36f43
- 调试 · f025c572
  由李瑞鑫提交于 8月 29, 2024
```
Former-commit-id: 18ec7eb0
```
  f025c572
- 调试 · 841bafba
  由李瑞鑫提交于 8月 29, 2024
```
Former-commit-id: 7136e0dc
```
  841bafba
28 8月, 2024 8 次提交
- Merge branch 'v23.3_lmsweight_20240827' into test · 1fb73123
  由李瑞鑫提交于 8月 28, 2024
```
Former-commit-id: 9aff4365
```
  1fb73123
- 空判断 · d5e04d31
  由李瑞鑫提交于 8月 28, 2024
  
  d5e04d31
- Merge branch 'v23.3_lmsweight_20240827' into test · d35ef815
  由李瑞鑫提交于 8月 28, 2024
```
Former-commit-id: f075dc13
```
  d35ef815
- 电子过磅单图片 · d28c5823
  由李瑞鑫提交于 8月 28, 2024
  
  d28c5823
- 电子过磅单图片 · e2dc12be
  由李瑞鑫提交于 8月 28, 2024
```
Former-commit-id: d7aa3b60
```
  e2dc12be
- Merge branch 'v23.3_lmsweight_20240827' into test · a0bae5ab
  由李瑞鑫提交于 8月 28, 2024
```
# Conflicts:
#	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: 93b2ef95
```
  a0bae5ab
- 电子过磅单图片 · 1bd9ceb3
  由李瑞鑫提交于 8月 28, 2024
  
  1bd9ceb3
- 电子过磅单图片 · fcc00713
  由李瑞鑫提交于 8月 28, 2024
  
  fcc00713
27 8月, 2024 6 次提交

代码冲突 · 372bfa14
由李瑞鑫提交于 8月 27, 2024
```
Former-commit-id: 45f219ef
```
372bfa14

Merge branch 'v22.8_sample_img_video_20240822' into test · 1b698c21

由提交于 8月 27, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java


Former-commit-id: 865b510b

1b698c21

Merge branch 'v20.6_carrier_station_pound_20240802' into test · d6d7dc9e

由提交于 8月 27, 2024

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java


Former-commit-id: a84bd520

d6d7dc9e

代码优化 · 5b71e935
由李瑞鑫提交于 8月 27, 2024

5b71e935
Merge branch 'master' into v20.6_carrier_station_pound_20240802 · 85fbdf3d
由李瑞鑫提交于 8月 27, 2024

85fbdf3d

Merge branch 'v21.5_offered_third_data_20240812' · 1c25a898

由提交于 8月 27, 2024

# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/extranal/user/OrderService.java
#	performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java

1c25a898

26 8月, 2024 1 次提交
- 采样点图片和视频 · 3f96dad8
  由杨启发提交于 8月 26, 2024
  
  3f96dad8
23 8月, 2024 3 次提交
- Merge remote-tracking branch 'origin/test' into test · 5c1c5a34
  由刘海泉提交于 8月 23, 2024
```
Former-commit-id: 3bd131d8
```
  5c1c5a34
- Merge remote-tracking branch 'origin/v21.5_offered_third_data_20240812' into test · 91a1d18f
  由刘海泉提交于 8月 23, 2024
```
Former-commit-id: 1009c96c
```
  91a1d18f
- 订单统计挂单数排除已取消的货单 · 28ea251f
  由刘海泉提交于 8月 23, 2024
  
  28ea251f
21 8月, 2024 6 次提交
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · 644ed2a9
  由李瑞鑫提交于 8月 21, 2024
```
# Conflicts:
#	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: 191fe103
```
  644ed2a9
- 提供拉取磅单图片接口 · c1fde448
  由李瑞鑫提交于 8月 21, 2024
  
  c1fde448
- Merge remote-tracking branch 'origin/test' into test · 4bedb148
  由刘海泉提交于 8月 21, 2024
```
Former-commit-id: bf34add8
```
  4bedb148
- Merge remote-tracking branch 'origin/v21.5_offered_third_data_20240812' into test · 9ac6506e
  由刘海泉提交于 8月 21, 2024
```
Former-commit-id: 0a442fc2
```
  9ac6506e
- 修改承运推马上来供应链预计时间问题 · 8d36c81a
  由刘海泉提交于 8月 21, 2024
  
  8d36c81a
- Merge branch 'fix_owner_settlement_order_detail_export_20240820' · 73763cb8
  由李瑞鑫提交于 8月 21, 2024
  
  73763cb8
20 8月, 2024 6 次提交
- Merge branch 'refs/heads/fix_owner_settlement_order_detail_export_20240820' into test · 6b2a3fb0
  由杨启发提交于 8月 20, 2024
```
Former-commit-id: cfcafe0d
```
  6b2a3fb0
- 修复空指针异常 · f6eab398
  由杨启发提交于 8月 20, 2024
  
  f6eab398
- Merge remote-tracking branch 'origin/v22.4_add_sub_weight_repair_20240820' into test · a0169e27
  由刘海泉提交于 8月 20, 2024
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java


Former-commit-id: 1fba6c9e
```
  a0169e27
- 修改履约进度表列表报错的问题 · 43f332cc
  由刘海泉提交于 8月 20, 2024
  
  43f332cc
- Merge branch 'v20.6_carrier_station_pound_20240802' into test · 43d6375a
  由李瑞鑫提交于 8月 20, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: b3794726
```
  43d6375a
- 实时获取电子磅单图片 · 3e66a4ff
  由李瑞鑫提交于 8月 20, 2024
  
  3e66a4ff
19 8月, 2024 3 次提交

校验不进行ocr识别 · 75c7b418
由李瑞鑫提交于 8月 19, 2024
```
Former-commit-id: eefbc508
```
75c7b418

Merge branch 'v20.6_carrier_station_pound_20240802' into test · 053022da

由提交于 8月 19, 2024

# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/dao/AppDao.java
#	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/mapper/AppMapper.java
#	performance-web/src/main/java/com/clx/performance/model/App.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: 4db9ffab

053022da

校验不进行ocr识别 · 50e301fc
由李瑞鑫提交于 8月 19, 2024

50e301fc