提交 · 4e03ac6073686d642192dd586d19e7110035eeb4 · 姜武杰 / clx-performance

29 5月, 2024 9 次提交
- Merge branch 'v16.0_screen_20240522' of https://t.clxkj.cn/clx-java/clx-performance into test · 4e03ac60
  由姜文业提交于 5月 29, 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: 1edd9cfe
```
  4e03ac60
- 车辆当前定位 · d0515678
  由姜文业提交于 5月 29, 2024
  
  d0515678
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 534246fe
  由艾庆国提交于 5月 29, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java


Former-commit-id: b30e00c5
```
  534246fe
- 运单预警 · f2c6420e
  由艾庆国提交于 5月 29, 2024
  
  f2c6420e
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 1ca688f7
  由艾庆国提交于 5月 29, 2024
```
Former-commit-id: c416f437
```
  1ca688f7
- 运单预警 · 4d7ab888
  由艾庆国提交于 5月 29, 2024
  
  4d7ab888
- 运单预警 · 2ea4d4d7
  由艾庆国提交于 5月 29, 2024
```
Former-commit-id: 6498712b
```
  2ea4d4d7
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 5e69d4b6
  由艾庆国提交于 5月 29, 2024
```
Former-commit-id: af991af0
```
  5e69d4b6
- 运单预警 · d6df0880
  由艾庆国提交于 5月 29, 2024
  
  d6df0880
28 5月, 2024 27 次提交
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 45a18baa
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: c6159bc3
```
  45a18baa
- 运单预警 · 73756c91
  由艾庆国提交于 5月 28, 2024
  
  73756c91
- 增加日志 · af76c7ce
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 19d770a2
```
  af76c7ce
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · a6c66c0c
  由刘海泉提交于 5月 28, 2024
```
Former-commit-id: 5526298c
```
  a6c66c0c
- 为测试提供车辆轨迹生成存入es的接口 · 9bc2f125
  由刘海泉提交于 5月 28, 2024
  
  9bc2f125
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · 8f0d585f
  由刘海泉提交于 5月 28, 2024
```
Former-commit-id: 4c4d8576
```
  8f0d585f
- 为测试提供车辆轨迹生成存入es的接口 · b0e4d18b
  由刘海泉提交于 5月 28, 2024
  
  b0e4d18b
- Merge remote-tracking branch 'origin/test' into test · 2d2428b1
  由刘海泉提交于 5月 28, 2024
```
Former-commit-id: 02be7421
```
  2d2428b1
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test · 3020af58
  由刘海泉提交于 5月 28, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java


Former-commit-id: 326f4cac
```
  3020af58
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into v15.4_truck_fleet_20240513 · 84062e73
  由刘海泉提交于 5月 28, 2024
  
  84062e73
- 为测试提供车辆轨迹生成存入es的接口 · f31a8356
  由刘海泉提交于 5月 28, 2024
  
  f31a8356
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 1b501788
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 86984610
```
  1b501788
- 开启中交兴路 · d46e5861
  由艾庆国提交于 5月 28, 2024
  
  d46e5861
- 开启中交兴路 · 7991c7d5
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 2e411d9e
```
  7991c7d5
- Merge branch 'refs/heads/v15.4_truck_fleet_20240513' into test · ce288343
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 878449bd
```
  ce288343
- 运单预警 · 06a009f6
  由艾庆国提交于 5月 28, 2024
  
  06a009f6
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 0c2ee644
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 066362ae
```
  0c2ee644
- 运单预警 · 35b66405
  由艾庆国提交于 5月 28, 2024
  
  35b66405
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · ccbeba0b
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 2a4c33d8
```
  ccbeba0b
- 运单预警 · 83d210b1
  由艾庆国提交于 5月 28, 2024
  
  83d210b1
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 468b62ca
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: a7230020
```
  468b62ca
- 运单预警 · 6a092689
  由艾庆国提交于 5月 28, 2024
  
  6a092689
- Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' · 5200a89e
  由刘海泉提交于 5月 28, 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
```
  5200a89e
- 车辆轨迹测试 · 64b715cf
  由艾庆国提交于 5月 28, 2024
```
Former-commit-id: 402e1039
```
  64b715cf
- 修改停留时间阈值和统计积分为上一周的代码 · 6d298e35
  由刘海泉提交于 5月 28, 2024
  
  6d298e35
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · 63613c28
  由艾庆国提交于 5月 28, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnParkWarnServiceImpl.java


Former-commit-id: 4be404c7
```
  63613c28
- 运单预警 · 112e38b0
  由艾庆国提交于 5月 28, 2024
  
  112e38b0
27 5月, 2024 4 次提交
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · fbd62f97
  由艾庆国提交于 5月 27, 2024
```
Former-commit-id: d5b83bfe
```
  fbd62f97
- 运单预警 · 5a5a7b79
  由艾庆国提交于 5月 27, 2024
  
  5a5a7b79
- Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test · b8d564ef
  由艾庆国提交于 5月 27, 2024
```
Former-commit-id: 798de39a
```
  b8d564ef
- 运单预警 · a50e49c8
  由艾庆国提交于 5月 27, 2024
  
  a50e49c8