Skip to content

C
clx-performance
切换分支/标签
  1. 11 6月, 2024 2 次提交
    • 李瑞鑫's avatar
      解决冲突 · e1c3e360
      由 李瑞鑫 提交于
      e1c3e360
    • 李瑞鑫's avatar
      Merge branch 'v16.3_line_warn_20240528' into test · 3b81e6f4
      由 李瑞鑫 提交于 
      # 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/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/esplus/model/DriverTraceESPlus.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildMapper.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/TruckTraceServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java
      3b81e6f4
  3. 07 6月, 2024 11 次提交
    • 艾庆国'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
      Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · d54eb19f
      由 刘海泉 提交于
      d54eb19f
    • 刘海泉's avatar
      修改自由车辆定向单对车队运营定向单的影响问题 · ab86f079
      由 刘海泉 提交于
      ab86f079
    • 艾庆国's avatar
      线路预警 · 4f53ef3c
      由 艾庆国 提交于
      4f53ef3c
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/v1.0_init_fleet_20240427' into test · bda9b6da
      由 刘海泉 提交于
      bda9b6da
    • 刘海泉's avatar
      修改自由车辆定向单对车队运营定向单的影响问题 · 724d8a16
      由 刘海泉 提交于
      724d8a16
    • 艾庆国's avatar
      线路预警 · f338023f
      由 艾庆国 提交于
      f338023f
    • 艾庆国's avatar
      线路预警 · 3a3197bc
      由 艾庆国 提交于
      3a3197bc
    • 艾庆国's avatar
      线路预警 · cf155fa5
      由 艾庆国 提交于
      cf155fa5
    • 艾庆国's avatar
      线路预警 · 88510b4a
      由 艾庆国 提交于
      88510b4a
  5. 06 6月, 2024 15 次提交
  7. 05 6月, 2024 12 次提交