提交 · 5fd0e6bb95e64ac4ddd36f52e78fa189baffc7f3 · 姜武杰 / clx-performance

15 5月, 2024 29 次提交
- Merge branch 'v15.4_truck_fleet_20240513' into test · 5fd0e6bb
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: 311e39d4
```
  5fd0e6bb
- 车辆轨迹同步 · b5296576
  由艾庆国提交于 5月 15, 2024
  
  b5296576
- Merge branch 'v15.4_truck_fleet_20240513' into test · 7e39a814
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: e5d81b54
```
  7e39a814
- Merge branch 'v14.4_vehicle_warn_20240425' into test · 12404d11
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: eac8f42e
```
  12404d11
- 运单预警 · 52513b00
  由艾庆国提交于 5月 15, 2024
  
  52513b00
- 运单预警 · febde2cd
  由艾庆国提交于 5月 15, 2024
  
  febde2cd
- 运单预警 · a1bc8054
  由艾庆国提交于 5月 15, 2024
  
  a1bc8054
- Merge remote-tracking branch 'origin/test' into test · 5c593dad
  由刘海泉提交于 5月 15, 2024
```
Former-commit-id: 83495c89
```
  5c593dad
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · 621f334a
  由刘海泉提交于 5月 15, 2024
```
Former-commit-id: 134797f2
```
  621f334a
- 修改积分统计的日期 · 5f45c614
  由刘海泉提交于 5月 15, 2024
  
  5f45c614
- Merge branch 'v14.4_vehicle_warn_20240425' into test · de69af6f
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: 1282bc5c
```
  de69af6f
- 代码优化 · 1715925b
  由艾庆国提交于 5月 15, 2024
  
  1715925b
- 代码优化 · d461b831
  由艾庆国提交于 5月 15, 2024
  
  d461b831
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · b40ad96b
  由刘海泉提交于 5月 15, 2024
```
Former-commit-id: efa15da0
```
  b40ad96b
- 修改查找车主接口报错的问题 · 55d0aedc
  由刘海泉提交于 5月 15, 2024
  
  55d0aedc
- Merge remote-tracking branch 'origin/test' into test · 44acc6fc
  由刘海泉提交于 5月 15, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java


Former-commit-id: 0fafdbba
```
  44acc6fc
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · b06672ae
  由刘海泉提交于 5月 15, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java


Former-commit-id: c710fa8e
```
  b06672ae
- Merge branch 'v15.4_truck_fleet_20240513' into test · 9ae14242
  由艾庆国提交于 5月 15, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java


Former-commit-id: aa8f986e
```
  9ae14242
- 代码优化 · 54eafc27
  由艾庆国提交于 5月 15, 2024
  
  54eafc27
- 合并车辆轨迹监控相关代码 · abbf03d8
  由刘海泉提交于 5月 15, 2024
  
  abbf03d8
- 合并车辆轨迹监控相关代码 · 50950d03
  由刘海泉提交于 5月 15, 2024
  
  50950d03
- Merge branch 'v14.4_vehicle_warn_20240425' into test · fd050305
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: 03e676a1
```
  fd050305
- 代码优化 · e310ba03
  由艾庆国提交于 5月 15, 2024
  
  e310ba03
- 增加日志 · f1718561
  由刘海泉提交于 5月 15, 2024
  
  f1718561
- Merge remote-tracking branch 'origin/test' into test · bf7a59e4
  由刘海泉提交于 5月 15, 2024
```
Former-commit-id: d1e7bdad
```
  bf7a59e4
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · 5f9f88df
  由刘海泉提交于 5月 15, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceMqService.java


Former-commit-id: 8c3102ef
```
  5f9f88df
- Merge branch 'v14.4_vehicle_warn_20240425' into test · 942088b1
  由艾庆国提交于 5月 15, 2024
```
Former-commit-id: c3719291
```
  942088b1
- 代码优化 · d3c369f8
  由艾庆国提交于 5月 15, 2024
  
  d3c369f8
- 增加全平台车辆轨迹监控定时任务存储到es中 · e4c94f78
  由刘海泉提交于 5月 15, 2024
  
  e4c94f78
14 5月, 2024 11 次提交
- Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test · d1ea250a
  由 huyufan 提交于 5月 14, 2024
```
Former-commit-id: 7a6a2111
```
  d1ea250a
- 开发：35吨展示优化 · 0fe02ef7
  由 huyufan 提交于 5月 14, 2024
  
  0fe02ef7
- 开发：bug优化 · 8f0c7f34
  由 huyufan 提交于 5月 14, 2024
  
  8f0c7f34
- merge · c7c98aab
  由刘海泉提交于 5月 14, 2024
```
Former-commit-id: 4de16d1b
```
  c7c98aab
- Merge remote-tracking branch 'origin/test' into test · 21d1fc67
  由刘海泉提交于 5月 14, 2024
```
# Conflicts:
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java


Former-commit-id: a1c656ad
```
  21d1fc67
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · 6ec4906c
  由刘海泉提交于 5月 14, 2024
```
# Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: af7abbd9
```
  6ec4906c
- 增加承运运单详情增加取消和接单时间字段 · 6699d761
  由刘海泉提交于 5月 14, 2024
  
  6699d761
- Merge remote-tracking branch 'origin/v12.2_upgradeFunction_20240424' into test · 4678759b
  由 huyufan 提交于 5月 14, 2024
```
Former-commit-id: 043c3810
```
  4678759b
- 开发：bug优化 · 719f910f
  由 huyufan 提交于 5月 14, 2024
  
  719f910f
- 新增车辆轨迹 · df39c2ed
  由刘海泉提交于 5月 14, 2024
  
  df39c2ed
- 新增车辆轨迹 · c6131aa0
  由刘海泉提交于 5月 14, 2024
  
  c6131aa0