From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index c427c62..5b3e9e1 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.web.dto.MultiFileDTO;
+import com.doumee.dao.web.response.goods.GoodsSkuResponse;
+import com.doumee.dao.web.response.goods.SkuResponse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -215,8 +218,58 @@
@ApiModelProperty(value = "涓撳尯缂栫爜" )
@TableField(exist = false)
private Integer zhuanquId;
+
@ApiModelProperty(value = "鍟嗗渚涜揣浠�" )
@TableField(exist = false)
private BigDecimal shopPrice;
+ @ApiModelProperty(value = "閿�閲�" )
+ @TableField(exist = false)
+ private Integer realSaleNum;
+
+ @ApiModelProperty(value = "鏈�浣庝环" )
+ @TableField(exist = false)
+ private BigDecimal minPrice;
+
+ @ApiModelProperty(value = "鍒掔嚎浠�" )
+ @TableField(exist = false)
+ private BigDecimal linePrice;
+
+ @ApiModelProperty(value = "渚涜揣浠�")
+ @TableField(exist = false)
+ private BigDecimal exFactoryPrice;
+
+ @ApiModelProperty(value = "閫傜敤鍝佺墝鍚嶇О")
+ @TableField(exist = false)
+ private String brandNames ;
+
+ @ApiModelProperty(value = "鐪熷疄搴撳瓨")
+ @TableField(exist = false)
+ private Integer stock;
+
+ @ApiModelProperty(value = "鏀惰棌鐘舵�侊細0=鏈敹钘忥紱1=宸叉敹钘�")
+ @TableField(exist = false)
+ private Integer collectStatus;
+
+ @ApiModelProperty(value = "鍟嗗搧瑙勬牸鍒楄〃")
+ @TableField(exist = false)
+ private List<GoodsSkuResponse> goodsSkuResponseList;
+
+
+ @ApiModelProperty(value = "鍟嗗搧鍟嗗搧SKU淇℃伅鍒楄〃")
+ @TableField(exist = false)
+ private List<SkuResponse> skuResponsesList;
+
+ @ApiModelProperty(value = "鍟嗗搧鍒嗙被")
+ @TableField(exist = false)
+ private Labels categoryLabels;
+
+
+ @ApiModelProperty(value = "鍝佺墝")
+ @TableField(exist = false)
+ private Labels brandLabels;
+
+ @ApiModelProperty(value = "鍟嗗搧杞挱鍥�")
+ @TableField(exist = false)
+ private List<MultiFileDTO> goodBannerMultiFiles;
}
--
Gitblit v1.9.3