Skip to content

C
clx-performance
切换分支/标签
  1. 12 6月, 2024 15 次提交
  3. 11 6月, 2024 7 次提交
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 8595b0f9
      由 刘海泉 提交于 
      # Conflicts:
#	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
      8595b0f9
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/orderChildDetail_add_unloadTime_20240611' into dev · 0f762c5c
      由 刘海泉 提交于 
      # 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
      0f762c5c
    • 刘海泉's avatar
      运单详情增加收货待确认时间字段 · 14344b10
      由 刘海泉 提交于
      14344b10
    • 李瑞鑫's avatar
      Merge branch 'v16.3_line_warn_20240528' into dev · 5372563e
      由 李瑞鑫 提交于
      5372563e
    • 李瑞鑫's avatar
      空返回0 · 2e57eed8
      由 李瑞鑫 提交于
      2e57eed8
    • 李瑞鑫's avatar
      Merge branch 'v16.3_line_warn_20240528' into dev · 391f6acc
      由 李瑞鑫 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/ResultEnum.java
#	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
#	performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnUser.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      391f6acc
    • 李瑞鑫's avatar
      空返回0 · a91183aa
      由 李瑞鑫 提交于
      a91183aa
  5. 07 6月, 2024 13 次提交
  7. 06 6月, 2024 5 次提交
    • 艾庆国's avatar
      Merge branch 'refs/heads/v16.3_line_warn_202405281' into dev · bd56e2c0
      由 艾庆国 提交于 
      # 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/impl/vehiclewarn/VehicleWarnUserServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      bd56e2c0
    • 艾庆国's avatar
      线路预警 · e44c3122
      由 艾庆国 提交于
      e44c3122
    • 李瑞鑫'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
      测试数据 · f11c5558
      由 艾庆国 提交于
      f11c5558