记得上下班打卡 | git大法好,push需谨慎

Commit 4c08d886 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 20240123_COUPON_SPU

parents 6264715d 592e9501
...@@ -161,6 +161,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -161,6 +161,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
} else { } else {
vo.setSpuNo(this.getSpuNo()); vo.setSpuNo(this.getSpuNo());
} }
vo.setSpuType(2);
vo.setName(this.getName()); vo.setName(this.getName());
// vo.setSubtitle(this.getSubtitle()); // vo.setSubtitle(this.getSubtitle());
// vo.setSellPrice(this.getSellPrice()); // vo.setSellPrice(this.getSellPrice());
...@@ -276,6 +277,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable { ...@@ -276,6 +277,7 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
// } else { // } else {
skuInfoVo.setSkuBarCode(goodsInfoVo.getSpuNo()); skuInfoVo.setSkuBarCode(goodsInfoVo.getSpuNo());
// } // }
skuInfoVo.setSkuType(2);
skuInfoVo.setName("张"); skuInfoVo.setName("张");
skuInfoVo.setSubtitle(goodsInfoVo.getSubtitle()); skuInfoVo.setSubtitle(goodsInfoVo.getSubtitle());
skuInfoVo.setSkuPic(""); skuInfoVo.setSkuPic("");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment