1. 24 9月, 2024 4 次提交
    • 刘海泉's avatar
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/v24.4_notice_20240903' into v26.2-jdk17springboot3-20240912 · 6ebb464a
      刘海泉 提交于
      # Conflicts:
      #	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/pom.xml
      6ebb464a
    • 艾庆国's avatar
      承运优化需求9.25-车主结算-冲突 · ba72c494
      艾庆国 提交于
      ba72c494
    • 艾庆国's avatar
      Merge branch 'refs/heads/v26.5_optimize_20240919' into test_jdk17 · cd4f33a1
      艾庆国 提交于
      # Conflicts:
      #	performance-api/src/main/java/com/clx/performance/vo/mq/settle/SettlementDriverSettleMqParam.java
      #	performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java
      #	performance-web/src/main/java/com/clx/performance/config/RabbitSettlementConfig.java
      #	performance-web/src/main/java/com/clx/performance/constant/RabbitKeySettlementConstants.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/settle/SettlementDriverDaoImpl.java
      #	performance-web/src/main/java/com/clx/performance/dao/settle/SettlementDriverDao.java
      #	performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
      #	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
      #	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementPostServiceImpl.java
      #	performance-web/src/main/java/com/clx/performance/service/settle/SettlementPostService.java
      cd4f33a1
  2. 23 9月, 2024 14 次提交
  3. 20 9月, 2024 16 次提交
  4. 19 9月, 2024 6 次提交