Skip to content

C
clx-performance
切换分支/标签
  1. 19 9月, 2023 9 次提交
    • liruixin's avatar
      Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into… · 86c64ad7
      由 liruixin 提交于 
      Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into v4.9_create_goods_child_20230918

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildPoundAuditDao.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildPoundLogDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildPoundAuditDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildPoundLogDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildPoundAuditMapper.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderChildPoundLogMapper.java
#	performance-web/src/main/java/com/clx/performance/model/OrderChildPoundAudit.java
#	performance-web/src/main/java/com/clx/performance/model/OrderChildPoundLog.java
      86c64ad7
    • liruixin's avatar
      运单审核 · 3f8ea7eb
      由 liruixin 提交于
      3f8ea7eb
    • huyufan's avatar
      开发：bug修复 · d84325a5
      由 huyufan 提交于
      d84325a5
    • huyufan's avatar
      Merge remote-tracking branch 'origin/huyufan' into v4.9_create_goods_child_20230918 · c0135509
      由 huyufan 提交于 
      # Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
      c0135509
    • huyufan's avatar
      开发：货单保存相关 · fac123cc
      由 huyufan 提交于
      fac123cc
    • aiqingguo's avatar
      dao · 942a9296
      由 aiqingguo 提交于
      942a9296
    • aiqingguo's avatar
      修改包路径 · c6617383
      由 aiqingguo 提交于
      c6617383
    • aiqingguo's avatar
      修改包路径 · 4659e1fa
      由 aiqingguo 提交于
      4659e1fa
    • aiqingguo's avatar
      接单 · d59310ee
      由 aiqingguo 提交于
      d59310ee
  3. 18 9月, 2023 8 次提交