Skip to content

C
clx-performance
切换分支/标签
  1. 25 9月, 2024 8 次提交
    • 姜文业's avatar
      Merge branch 'v27.1_carrier_column_20240924' of… · f6e0e85f
      由 姜文业 提交于 
      Merge branch 'v27.1_carrier_column_20240924' of https://t.clxkj.cn/clx-java/clx-performance into v26.2-jdk17springboot3-20240912
      f6e0e85f
    • 艾庆国's avatar
      承运优化需求9.30-冲突 · 2ce79713
      由 艾庆国 提交于
      2ce79713
    • 艾庆国's avatar
      Merge branch 'refs/heads/v26.5_optimize_20240919' into v26.2-jdk17springboot3-20240912 · 048e088a
      由 艾庆国 提交于 
      # Conflicts:
#	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/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/settle/SettlementPostService.java
      048e088a
    • 艾庆国's avatar
      承运优化需求9.30-冲突 · 3a4ca4d3
      由 艾庆国 提交于
      3a4ca4d3
    • 艾庆国's avatar
      Merge branch 'refs/heads/master' into v26.5_optimize_20240919 · 254d636d
      由 艾庆国 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/mq/settle/SettlementDriverSettleMqParam.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/SettlementOrderChildRiskServiceImpl.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
      254d636d
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/v24.4_notice_20240903' into v26.2-jdk17springboot3-20240912 · 1d2a1daa
      由 刘海泉 提交于
      1d2a1daa
    • 刘海泉's avatar
      增加短信发送的日志打印 · 6b4de34d
      由 刘海泉 提交于
      6b4de34d
    • 姜文业's avatar
      承运新增字段同步到网络货运大后台 · a89fdc02
      由 姜文业 提交于
      a89fdc02
  3. 24 9月, 2024 27 次提交
  5. 23 9月, 2024 5 次提交
    • 艾庆国's avatar
      承运优化需求9.30-解决冲突 · bf0259c8
      由 艾庆国 提交于
      bf0259c8
    • 艾庆国's avatar
      Merge branch 'refs/heads/v26.5_optimize_20240919' into v26.2-jdk17springboot3-20240912 · 88ae954d
      由 艾庆国 提交于 
      # 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
      88ae954d
    • 艾庆国's avatar
      承运优化需求9.30 · 88e80207
      由 艾庆国 提交于
      88e80207
    • 艾庆国's avatar
      Merge branch 'refs/heads/v26.5_optimize_20240918' into v26.2-jdk17springboot3-20240912 · 7852d25a
      由 艾庆国 提交于
      7852d25a
    • 艾庆国's avatar
      承运优化需求9.25-车主结算 · c5853455
      由 艾庆国 提交于
      c5853455