From 672637fa4a4914ec9667cb15f70b67482b8a0e5e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 25 九月 2025 17:16:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into user_action
---
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
index 4cd6b2d..6f968a3 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
@@ -3,6 +3,8 @@
import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
@@ -148,6 +150,7 @@
private String mobileIntro;
@ApiModelProperty(value = "鍟嗗搧瑙嗛")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String goodsVideo;
@ApiModelProperty(value = "鏄惁涓烘帹鑽愬晢鍝�", required = true)
@@ -166,6 +169,12 @@
@ApiModelProperty(value = "棰勮鏁伴噺")
private Integer alertQuantity;
+
+ @ApiModelProperty(value ="浼樻儬鍔礽d")
+ private String couponId;
+
+ @ApiModelProperty(value ="浼樻儬鍔靛悕")
+ private String couponName;
public Double getWeight() {
if (weight == null) {
@@ -220,6 +229,7 @@
this.storeCategoryPath = goods.getStoreCategoryPath();
this.freightTemplateId = goods.getTemplateId();
this.recommend = goods.getRecommend();
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0