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 |   75 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 1 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 a77be1d..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;
@@ -127,7 +130,6 @@
     private String parentCategoryId;
 
     @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1", hidden = true)
-    @TableField(exist = false)
     private BigDecimal deductRata;
 
 
@@ -138,6 +140,9 @@
     @ApiModelProperty(value = "sku閲戦", hidden = true)
     @TableField(exist = false)
     private BigDecimal skuPrice;
+    @ApiModelProperty(value = "sku鏄剧ず浠锋牸", hidden = true)
+    @TableField(exist = false)
+    private BigDecimal showPrice;
 
     @ApiModelProperty(value = "sku鎬婚噾棰�", hidden = true)
     @TableField(exist = false)
@@ -190,6 +195,9 @@
     @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
     @TableField(exist = false)
     private List<Sku>  skuList;
+    @ApiModelProperty(value = "鍟嗗搧缂栫爜闆嗗悎")
+    @TableField(exist = false)
+    private List<Integer>  idList;
     @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
     @TableField(exist = false)
     private List<Labels>  brandList;
@@ -197,6 +205,71 @@
     @ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
     @TableField(exist = false)
     private List<GoodsSku>  goodsSkuList;
+    @ApiModelProperty(value = "渚涢姺鍟嗘暟閲�")
+    @TableField(exist = false)
+    private Long shopNum;
+    @ApiModelProperty(value = "宸茶缃緵閵峰晢鏁伴噺")
+    @TableField(exist = false)
+    private Long pricedShopNum;
+
+    @ApiModelProperty(value = "shopId" )
+    @TableField(exist = false)
+    private Integer shopId;
+    @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