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

24 10月, 2024 18 次提交
- Merge remote-tracking branch 'origin/v31.2_accept_orders_20241024' into test_jdk17 · d5ad4d11
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: bbb04648
```
  d5ad4d11
- 修改车辆限制的代码位置 · fceec3fb
  由刘海泉提交于 10月 24, 2024
  
  fceec3fb
- Merge remote-tracking branch 'origin/v31.2_accept_orders_20241024' into test_jdk17 · 2e5fc73e
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: d6035cf9
```
  2e5fc73e
- 修改异常抛出返回code值 · 1e4bbe66
  由刘海泉提交于 10月 24, 2024
  
  1e4bbe66
- Merge remote-tracking branch 'origin/v31.2_accept_orders_20241024' into test_jdk17 · f39d62b8
  由刘海泉提交于 10月 24, 2024
```
# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressVO.java


Former-commit-id: c41674e5
```
  f39d62b8
- 修改接口返回值类型 · c5a99719
  由刘海泉提交于 10月 24, 2024
  
  c5a99719
- 新增抢单限制逻辑 · 4fae1d5e
  由刘海泉提交于 10月 24, 2024
  
  4fae1d5e
- merge · 82d64f50
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: 29c08826
```
  82d64f50
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 8ae679e2
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: b7e8c1ef
```
  8ae679e2
- 修改订单状态不更新的问题 · 4ec99b42
  由刘海泉提交于 10月 24, 2024
  
  4ec99b42
- Merge remote-tracking branch 'origin/test_jdk17' into test_jdk17 · 39be3337
  由马路路提交于 10月 24, 2024
```
Former-commit-id: 9f4843d1
```
  39be3337
- Merge remote-tracking branch 'origin/v29.7_pending_freight_20241017' into test_jdk17 · 7d6d161d
  由刘海泉提交于 10月 24, 2024
```
Former-commit-id: 9957a235
```
  7d6d161d
- 增加运单监听同步挂单运费表 · cdc146e5
  由刘海泉提交于 10月 24, 2024
  
  cdc146e5
- Merge remote-tracking branch 'origin/v29.6_ultimate_interaction_20241017' into test_jdk17 · 9c82cfa9
  由马路路提交于 10月 24, 2024
```
# Conflicts:
#	clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java


Former-commit-id: 63ae4cee
```
  9c82cfa9
- 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 8 次提交
- 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
- 配置中心—配置管理—问卷配置WEB端接口--打印输出日志 · 37ff64ed
  由马路路提交于 10月 22, 2024
  
  37ff64ed
- merge · ded785c4
  由刘海泉提交于 10月 22, 2024
```
Former-commit-id: 60ef83c4
```
  ded785c4
- 编译问题修改 · 26961528
  由李瑞鑫提交于 10月 22, 2024
  
  26961528