1. 18 6月, 2024 4 次提交
  2. 13 6月, 2024 1 次提交
  3. 12 6月, 2024 18 次提交
  4. 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 10 次提交
    • 艾庆国's avatar
      Merge branch 'refs/heads/v16.3_line_warn_202405281' into v16.3_line_warn_20240528 · 7f027bf0
      艾庆国 提交于
      # Conflicts:
      #	performance-api/src/main/java/com/clx/performance/enums/ResultEnum.java
      #	performance-api/src/main/java/com/clx/performance/enums/vehiclewarn/VehicleWarnUserEnum.java
      #	performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/PageVehicleWarnUserParam.java
      #	performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/VehicleWarnUserConfigUpdateParam.java
      #	performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnUserVO.java
      #	performance-web/src/main/java/com/clx/performance/config/ClxMessageConfig.java
      #	performance-web/src/main/java/com/clx/performance/controller/pc/vehiclewarn/VehicleWarnUserController.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/dao/impl/vehiclewarn/VehicleWarnUserDaoImpl.java
      #	performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnUserDao.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/impl/vehiclewarn/VehicleWarnUserServiceImpl.java
      #	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      #	performance-web/src/main/java/com/clx/performance/service/vehiclewarn/VehicleWarnUserService.java
      #	performance-web/src/main/java/com/clx/performance/sqlProvider/vehiclewarn/VehicleWarnUserSqlProvider.java
      7f027bf0
    • 艾庆国's avatar
      e494f5e9
    • 艾庆国's avatar
      线路预警 · 626d8cd1
      艾庆国 提交于
      626d8cd1
    • 艾庆国's avatar
      635edf34
    • 艾庆国's avatar
      线路预警 · 4f53ef3c
      艾庆国 提交于
      4f53ef3c
    • 艾庆国's avatar
      d50c4e31
    • 艾庆国's avatar
      线路预警 · f338023f
      艾庆国 提交于
      f338023f
    • 艾庆国's avatar
      919dd68e
    • 艾庆国's avatar
      线路预警 · 3a3197bc
      艾庆国 提交于
      3a3197bc
    • 艾庆国's avatar
      d5f483ee