Skip to content

C
clx-performance
切换分支/标签
  1. 31 10月, 2023 15 次提交
    • liruixin's avatar
      Merge branch 'master' into v5.7_break_contract_reverse_20231020 · ebe82ead
      由 liruixin 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
#	performance-web/src/main/java/com/clx/performance/component/IdGenerateSnowFlake.java
#	performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
#	performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
#	performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java
      ebe82ead
    • liruixin's avatar
      违约金 · 27608232
      由 liruixin 提交于
      27608232
    • huyufan's avatar
      优化相关代码 · 96a075ba
      由 huyufan 提交于
      96a075ba
    • huyufan's avatar
      优化相关代码 · 51d39cfb
      由 huyufan 提交于
      51d39cfb
    • huyufan's avatar
      优化相关代码 · 21f100d7
      由 huyufan 提交于
      21f100d7
    • liruixin's avatar
      import com.clx.order.params.PageOrderGoodsListParam; · 41935264
      由 liruixin 提交于
      41935264
    • liruixin's avatar
      Merge branch 'v5.5_settlement_20231011' · e1e96ce9
      由 liruixin 提交于 
      # Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java
      e1e96ce9
    • huyufan's avatar
      Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into… · 93996aaf
      由 huyufan 提交于 
      Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into v5.7_break_contract_reverse_20231020
      93996aaf
    • huyufan's avatar
      修改BUG · 1c6d3fb7
      由 huyufan 提交于
      1c6d3fb7
    • liruixin's avatar
      Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into… · 3b379097
      由 liruixin 提交于 
      Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into v5.7_break_contract_reverse_20231020
      3b379097
    • liruixin's avatar
      自动生成违约金 · db95724c
      由 liruixin 提交于
      db95724c
    • huyufan's avatar
      修改BUG · 17b592c6
      由 huyufan 提交于
      17b592c6
    • huyufan's avatar
      修改BUG · 1ad394a3
      由 huyufan 提交于
      1ad394a3
    • huyufan's avatar
      临时注释相关 · 79421ce0
      由 huyufan 提交于
      79421ce0
    • huyufan's avatar
      货单编辑接口 · 84043e73
      由 huyufan 提交于
      84043e73
  3. 30 10月, 2023 25 次提交