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

07 6月, 2024 4 次提交
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · edc90586
  由刘海泉提交于 6月 07, 2024
```
Former-commit-id: d54eb19f
```
  edc90586
- 修改自由车辆定向单对车队运营定向单的影响问题 · ab86f079
  由刘海泉提交于 6月 07, 2024
  
  ab86f079
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · 70c68c89
  由刘海泉提交于 6月 07, 2024
```
Former-commit-id: bda9b6da
```
  70c68c89
- 修改自由车辆定向单对车队运营定向单的影响问题 · 724d8a16
  由刘海泉提交于 6月 07, 2024
  
  724d8a16
06 6月, 2024 7 次提交
- 车辆白名单 · b6aad24f
  由艾庆国提交于 6月 06, 2024
```
Former-commit-id: 611912e3
```
  b6aad24f
- 车辆白名单 · 0f0b6718
  由艾庆国提交于 6月 06, 2024
```
Former-commit-id: 8d1e4194
```
  0f0b6718
- 车辆白名单 · 71905067
  由艾庆国提交于 6月 06, 2024
```
Former-commit-id: aebe06f2
```
  71905067
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · e8cb5754
  由刘海泉提交于 6月 06, 2024
```
Former-commit-id: 499904ae
```
  e8cb5754
- 修改运单接单定向单的拦截问题 · 01288ddb
  由刘海泉提交于 6月 06, 2024
  
  01288ddb
- Merge remote-tracking branch 'origin/es_add_truck_new_pos_20240606' into test · aae4fddb
  由刘海泉提交于 6月 06, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java


Former-commit-id: f8b54194
```
  aae4fddb
- 新增es车辆最新位置索引保存 · 5f2ad709
  由刘海泉提交于 6月 06, 2024
  
  5f2ad709
05 6月, 2024 6 次提交
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · cd8e1773
  由艾庆国提交于 6月 05, 2024
```
Former-commit-id: d095a78e
```
  cd8e1773
- 运单预警 · 8e47f623
  由艾庆国提交于 6月 05, 2024
  
  8e47f623
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 2ecc291c
  由艾庆国提交于 6月 05, 2024
```
Former-commit-id: fd964666
```
  2ecc291c
- 运单预警 · 23da6dc7
  由艾庆国提交于 6月 05, 2024
  
  23da6dc7
- Merge branch 'v16.0_screen_20240522' of https://t.clxkj.cn/clx-java/clx-performance into test · d7f2ecf0
  由姜文业提交于 6月 05, 2024
```
Former-commit-id: afdc6f6a
```
  d7f2ecf0
- 车辆当前定位 · 12316d97
  由姜文业提交于 6月 05, 2024
  
  12316d97
04 6月, 2024 18 次提交
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · a9beeaa8
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 3e33598c
```
  a9beeaa8
- 修改app首页货单列表的sql · 3b3c2109
  由刘海泉提交于 6月 04, 2024
  
  3b3c2109
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · 52fb84c4
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: a322b8e6
```
  52fb84c4
- 修改app首页货单列表的sql · 6c0984dc
  由刘海泉提交于 6月 04, 2024
  
  6c0984dc
- Merge branch 'v1.0_init_fleet_20240427' into test · 2b68a381
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 372563f4
```
  2b68a381
- 修改app首页货单列表的sql · 4823ced7
  由刘海泉提交于 6月 04, 2024
  
  4823ced7
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · f0e694fd
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 43d0db59
```
  f0e694fd
- 修改app首页货单列表的sql · 19e7a8d3
  由刘海泉提交于 6月 04, 2024
  
  19e7a8d3
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · ea30f271
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 8f1d07ee
```
  ea30f271
- 修改货单分发相关逻辑修改 · 3e2b356a
  由刘海泉提交于 6月 04, 2024
  
  3e2b356a
- 修改货单分发相关逻辑修改 · 18baf727
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 7cf12326
```
  18baf727
- Merge remote-tracking branch 'origin/test' into test · 340b9124
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: 0b3c8430
```
  340b9124
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · df91433e
  由刘海泉提交于 6月 04, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: 556bcd64
```
  df91433e
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · e2da1e95
  由艾庆国提交于 6月 04, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnReceiveAddressWarnServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnSendAddressWarnServiceImpl.java


Former-commit-id: e53ccd7c
```
  e2da1e95
- 运单预警 · 24537d3d
  由艾庆国提交于 6月 04, 2024
  
  24537d3d
- Merge remote-tracking branch 'origin/test' into test · c4d8a1ac
  由刘海泉提交于 6月 04, 2024
```
Former-commit-id: fdec2117
```
  c4d8a1ac
- Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · e6665b60
  由刘海泉提交于 6月 04, 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/mapper/OrderChildMapper.java


Former-commit-id: 6df05600
```
  e6665b60
- 修改货单分发相关逻辑修改 · b8ce0a32
  由刘海泉提交于 6月 04, 2024
  
  b8ce0a32
03 6月, 2024 5 次提交
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 1ddebe75
  由艾庆国提交于 6月 03, 2024
```
Former-commit-id: 448e3625
```
  1ddebe75
- 运单预警 · 21785611
  由艾庆国提交于 6月 03, 2024
  
  21785611
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · b8b6a1df
  由艾庆国提交于 6月 03, 2024
```
Former-commit-id: c1006309
```
  b8b6a1df
- 运单预警 · e93e2b03
  由艾庆国提交于 6月 03, 2024
  
  e93e2b03
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · b01b5780
  由艾庆国提交于 6月 03, 2024
```
Former-commit-id: c4368862
```
  b01b5780