Skip to content

C
clx-performance
切换分支/标签
  1. 27 8月, 2024 1 次提交
  3. 23 8月, 2024 2 次提交
  5. 21 8月, 2024 2 次提交
  7. 20 8月, 2024 3 次提交
    • 杨启发's avatar
      Merge branch 'refs/heads/fix_owner_settlement_order_detail_export_20240820' into release · 4cdfbd6d
      由 杨启发 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/AppDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
      4cdfbd6d
    • 杨启发's avatar
      修复空指针异常 · f6eab398
      由 杨启发 提交于
      f6eab398
    • 李瑞鑫's avatar
      实时获取电子磅单图片 · 3e66a4ff
      由 李瑞鑫 提交于
      3e66a4ff
  9. 19 8月, 2024 8 次提交
    • 李瑞鑫's avatar
      校验不进行ocr识别 · 50e301fc
      由 李瑞鑫 提交于
      50e301fc
    • 李瑞鑫's avatar
      Merge branch 'v20.9_settlement_20240805' · 2f77b75d
      由 李瑞鑫 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
      2f77b75d
    • 艾庆国's avatar
      Merge branch 'refs/heads/v20.9_settlement_20240805' into release · c992caf3
      由 艾庆国 提交于
      c992caf3
    • 艾庆国's avatar
      承运结算单优化-司机结算 · e06bf595
      由 艾庆国 提交于
      e06bf595
    • 李瑞鑫's avatar
      Merge branch 'master' into v20.6_carrier_station_pound_20240802 · 9b67a0ce
      由 李瑞鑫 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/AppEnum.java
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/dao/AppDao.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/AppMapper.java
#	performance-web/src/main/java/com/clx/performance/model/App.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
      9b67a0ce
    • 李瑞鑫's avatar
      appDao · 09484076
      由 李瑞鑫 提交于
      09484076
    • 李瑞鑫's avatar
      appDaoImpl · 2ab47c0b
      由 李瑞鑫 提交于
      2ab47c0b
    • 李瑞鑫's avatar
      Merge branch 'v20.8_add_sub_weight_20240805' · de234430
      由 李瑞鑫 提交于 
      # Conflicts:
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
      de234430
  11. 16 8月, 2024 13 次提交
  13. 15 8月, 2024 11 次提交