提交 · 0b9e1c233ba27a0120d5fe974fcf298c95152ec7 · 姜武杰 / clx-performance

18 12月, 2023 12 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 0b9e1c23
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 7cc670ad
```
  0b9e1c23
- 查询当前订单号是否已经生成货主结算单明细 · 760a1392
  由 huyufan 提交于 12月 18, 2023
  
  760a1392
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 63b8ba75
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 8f377490
```
  63b8ba75
- 预付运费计算逻辑变更 · 39220ba2
  由 huyufan 提交于 12月 18, 2023
  
  39220ba2
- 承运同步-查询风控状态 · db345305
  由 aiqingguo 提交于 12月 18, 2023
  
  db345305
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 342ca004
  由 huyufan 提交于 12月 18, 2023
```
Former-commit-id: 152005dd
```
  342ca004
- 预付运费计算逻辑变更 · 03e92e84
  由 huyufan 提交于 12月 18, 2023
  
  03e92e84
- 承运同步-测试加密时间 · b63b540e
  由 aiqingguo 提交于 12月 18, 2023
```
Former-commit-id: db547244
```
  b63b540e
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 80d58d16
  由 liuhaiquan 提交于 12月 18, 2023
```
Former-commit-id: e772218b
```
  80d58d16
- 修改批量支付提示信息错误的问题 · 26335ef4
  由 liuhaiquan 提交于 12月 18, 2023
  
  26335ef4
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · fa1033dc
  由 liuhaiquan 提交于 12月 18, 2023
```
Former-commit-id: 80e751ea
```
  fa1033dc
- 增加钱包对响应结果转化的日志打印 · 32196cc7
  由 liuhaiquan 提交于 12月 18, 2023
  
  32196cc7
15 12月, 2023 19 次提交
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 9c27703b
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: ec666fb6
```
  9c27703b
- 违约结算单增加错误的提示信息 · 28b86476
  由 liuhaiquan 提交于 12月 15, 2023
  
  28b86476
- Merge remote-tracking branch 'origin/test' into test · d16e2b4b
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: 135268c5
```
  d16e2b4b
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · 431cfb78
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: c3d36bb4
```
  431cfb78
- 增加错误的提示信息 · 31246ea5
  由 liuhaiquan 提交于 12月 15, 2023
  
  31246ea5
- Merge remote-tracking branch 'origin/test' into test · 9959427b
  由 huyufan 提交于 12月 15, 2023
```
Former-commit-id: d5cd54bc
```
  9959427b
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · e7b31ab5
  由 huyufan 提交于 12月 15, 2023
```
Former-commit-id: f18ce538
```
  e7b31ab5
- 处理BUG · 723f0c58
  由 huyufan 提交于 12月 15, 2023
  
  723f0c58
- 处理BUG · 2160aef3
  由 huyufan 提交于 12月 15, 2023
  
  2160aef3
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · f32b8c5e
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: 9cd5e83c
```
  f32b8c5e
- 车主结算单批量支付失败后增加支付结果的页面显示 · 2fb1a889
  由 liuhaiquan 提交于 12月 15, 2023
  
  2fb1a889
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · b1064125
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: 3d55052f
```
  b1064125
- 修改结算单查询的sql · 2e5c4328
  由 liuhaiquan 提交于 12月 15, 2023
  
  2e5c4328
- Merge remote-tracking branch 'origin/test' into test · 9265a755
  由 liuhaiquan 提交于 12月 15, 2023
```
Former-commit-id: 9c181da6
```
  9265a755
- Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test · fa86fd26
  由 liuhaiquan 提交于 12月 15, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java


Former-commit-id: 65958a8c
```
  fa86fd26
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 2811714d
  由 huyufan 提交于 12月 15, 2023
```
Former-commit-id: 5eb2a8c9
```
  2811714d
- 处理BUG · f4d33c35
  由 huyufan 提交于 12月 15, 2023
  
  f4d33c35
- 修改结算单查询的sql · d2618a9f
  由 liuhaiquan 提交于 12月 15, 2023
  
  d2618a9f
- Merge remote-tracking branch 'origin/master' into v7.6_small_version_fix_20231204 · 9c1914a7
  由 liuhaiquan 提交于 12月 15, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
```
  9c1914a7
14 12月, 2023 9 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · c777e7ce
  由 huyufan 提交于 12月 14, 2023
```
Former-commit-id: 325af419
```
  c777e7ce
- 处理BUG · 98688595
  由 huyufan 提交于 12月 14, 2023
  
  98688595
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · ee9607c7
  由 huyufan 提交于 12月 14, 2023
```
Former-commit-id: 9c01876f
```
  ee9607c7
- 处理BUG · 5867936f
  由 huyufan 提交于 12月 14, 2023
  
  5867936f
- Merge remote-tracking branch 'origin/master' into v7.8_listenAndComplaint_20231208 · 657cf9f1
  由 liuhaiquan 提交于 12月 14, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
```
  657cf9f1
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 7decd794
  由 huyufan 提交于 12月 14, 2023
```
Former-commit-id: 1dcbe7a8
```
  7decd794
- 处理BUG · 6fb92344
  由 huyufan 提交于 12月 14, 2023
  
  6fb92344
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 32a5bcc7
  由 huyufan 提交于 12月 14, 2023
```
Former-commit-id: e1add931
```
  32a5bcc7
- 处理BUG · f56405a0
  由 huyufan 提交于 12月 14, 2023
  
  f56405a0