From 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java | 21 +++++++++++++++++++++
1 files changed, 21 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 1b77b11..7a45978 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
@@ -2,6 +2,7 @@
import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
+import cn.lili.modules.order.order.entity.enums.CustomizeFlagEnum;
import cn.lili.mybatis.BaseEntity;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -170,6 +171,25 @@
@ApiModelProperty(value = "棰勮鏁伴噺")
private Integer alertQuantity;
+ @ApiModelProperty(value ="浼樻儬鍔礽d")
+ private String couponId;
+
+ @ApiModelProperty(value ="浼樻儬鍔靛悕")
+ private String couponName;
+
+ @ApiModelProperty(value ="瀹氬埗妯℃澘id")
+ private String customizeTemplateId;
+
+ @ApiModelProperty(value ="瀹氬埗妯℃澘鍚嶇О")
+ private String customizeTemplateName;
+
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙瀹氬埗鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛氬畾鍒跺晢鍝�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ /**
+ * @see CustomizeFlagEnum
+ */
+ private String customizeFlag;
+
public Double getWeight() {
if (weight == null) {
return 0d;
@@ -223,6 +243,7 @@
this.storeCategoryPath = goods.getStoreCategoryPath();
this.freightTemplateId = goods.getTemplateId();
this.recommend = goods.getRecommend();
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0