Skip to content

C
clx-performance
切换分支/标签
  1. 12 6月, 2024 2 次提交
    • 刘海泉's avatar
      merge增加注入的dts类 · f81eb936
      由 刘海泉 提交于
      f81eb936
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/orderChildDetail_add_unloadTime_20240611' into release · 97cc26f9
      由 刘海泉 提交于 
      # Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      97cc26f9
  3. 11 6月, 2024 1 次提交
  5. 07 6月, 2024 1 次提交
  7. 06 6月, 2024 3 次提交
    • 李瑞鑫's avatar
      解决冲突 · 3208a1fc
      由 李瑞鑫 提交于
      3208a1fc
    • 李瑞鑫's avatar
      Merge branch 'v14.4_vehicle_warn_20240425' · acab729b
      由 李瑞鑫 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTraceVO.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTruckTraceVO.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceMqService.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      acab729b
    • 姜文业's avatar
      Merge branch 'v16.0_screen_20240522' of https://t.clxkj.cn/clx-java/clx-performance into release · bfd7e441
      由 姜文业 提交于 
       Conflicts:
	performance-web/pom.xml
      bfd7e441
  9. 05 6月, 2024 5 次提交
  11. 04 6月, 2024 2 次提交
  13. 03 6月, 2024 8 次提交
  15. 01 6月, 2024 2 次提交
  17. 31 5月, 2024 7 次提交
    • 艾庆国's avatar
      Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into release · b0088ecd
      由 艾庆国 提交于
      b0088ecd
    • 艾庆国's avatar
      运单预警 · 9ea4ca7b
      由 艾庆国 提交于
      9ea4ca7b
    • 艾庆国's avatar
      Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into release · 880fab98
      由 艾庆国 提交于
      880fab98
    • 艾庆国's avatar
      运单预警 · 1f252aa4
      由 艾庆国 提交于
      1f252aa4
    • 艾庆国's avatar
      运单预警 · ad10d7cd
      由 艾庆国 提交于
      ad10d7cd
    • 艾庆国's avatar
      Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into release · ad6e8f39
      由 艾庆国 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTraceVO.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/trace/DriverTruckTraceVO.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceMqService.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      ad6e8f39
    • 姜文业's avatar
      车辆当前定位 · 03df4cf2
      由 姜文业 提交于
      03df4cf2
  19. 30 5月, 2024 9 次提交