Skip to content

C
clx-performance
切换分支/标签
  1. 12 6月, 2024 5 次提交
  3. 11 6月, 2024 2 次提交
  5. 07 6月, 2024 7 次提交
    • 艾庆国'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
      线路预警 · 626d8cd1
      由 艾庆国 提交于
      626d8cd1
    • 艾庆国's avatar
      线路预警 · 4f53ef3c
      由 艾庆国 提交于
      4f53ef3c
    • 艾庆国's avatar
      线路预警 · f338023f
      由 艾庆国 提交于
      f338023f
    • 艾庆国's avatar
      线路预警 · 3a3197bc
      由 艾庆国 提交于
      3a3197bc
    • 艾庆国's avatar
      线路预警 · cf155fa5
      由 艾庆国 提交于
      cf155fa5
    • 艾庆国's avatar
      线路预警 · 88510b4a
      由 艾庆国 提交于
      88510b4a
  7. 06 6月, 2024 8 次提交
    • 艾庆国'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
      线路预警 · 52802437
      由 艾庆国 提交于
      52802437
    • 艾庆国's avatar
      线路预警 · 8abffb2c
      由 艾庆国 提交于
      8abffb2c
    • 艾庆国's avatar
      线路预警 · 2649eda2
      由 艾庆国 提交于
      2649eda2
    • 艾庆国's avatar
      线路预警 · 28e68485
      由 艾庆国 提交于
      28e68485
    • 艾庆国's avatar
      线路预警 · c89b1cc8
      由 艾庆国 提交于
      c89b1cc8
  9. 05 6月, 2024 17 次提交
  11. 04 6月, 2024 1 次提交