Skip to content

C
clx-performance
切换分支/标签
  1. 16 8月, 2024 9 次提交
    • 李瑞鑫's avatar
      Merge branch 'v20.9_settlement_20240805' into release · d9121809
      由 李瑞鑫 提交于
      d9121809
    • 李瑞鑫's avatar
      /** · be232ffe
      由 李瑞鑫 提交于 
               *   无需开票+否：未开票
         *   全部为否：未开票
         *   无需开票+是 ：部分开票
         *   无需开票+是+否 ：部分开票
         *   全部为是：已开票
         *   全部为无需开票：无需开票
         */
      be232ffe
    • 杨启发's avatar
      结算单优化 · ee84784b
      由 杨启发 提交于
      ee84784b
    • 杨启发's avatar
      Merge branch 'refs/heads/v20.9_settlement_20240805' into release · 4319c9f1
      由 杨启发 提交于 
      # 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
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
      4319c9f1
    • 李瑞鑫's avatar
      Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · fc57a317
      由 李瑞鑫 提交于
      fc57a317
    • 李瑞鑫's avatar
      开票状态处理 · 5520b428
      由 李瑞鑫 提交于
      5520b428
    • 刘海泉's avatar
      merge · d7b85378
      由 刘海泉 提交于
      d7b85378
    • 刘海泉's avatar
      Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into release · c6ef5a24
      由 刘海泉 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.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/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.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/service/OrderChildService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java
      c6ef5a24
    • 刘海泉's avatar
      修改货单拉超吨数，货单状态变成已完结的问题 · c8451e76
      由 刘海泉 提交于
      c8451e76
  3. 15 8月, 2024 31 次提交