From dce1e83ec27a066ebc6c17a4ac6d03c9ad6ff703 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 十二月 2025 14:21:39 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 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 8d851f7..a8e80dc 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
@@ -74,10 +74,9 @@
     @ExcelColumn(name="鍝佺墝缂栫爜锛堝叧鑱攍abels琛級")
     private Integer brandId;
 
-    @ApiModelProperty(value = "灞曠ず浠锋牸", example = "1")
+    @ApiModelProperty(value = "灞曠ず浠锋牸(鍑哄巶浠�)", example = "1")
     @ExcelColumn(name="灞曠ず浠锋牸")
     private BigDecimal price;
-
     @ApiModelProperty(value = "鍒濆閿�閲�", example = "1")
     @ExcelColumn(name="鍒濆閿�閲�")
     private Integer salenum;
@@ -113,10 +112,38 @@
     @ApiModelProperty(value = "鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
     @ExcelColumn(name="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
     private String labels;
+    @ApiModelProperty(value = "鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+    @ExcelColumn(name="鎵�灞炰笓鍖篒D闆嗗悎锛岋紙[1],[2]锛�")
+    private String zhuanquIds;
+    @ApiModelProperty(value = "閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+    @ExcelColumn(name="閫傜敤鍝佺墝ID闆嗗悎锛岋紙[1],[2]锛�")
+    private String brandIds;
+    @ApiModelProperty(value = "閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+    @ExcelColumn(name="閫傜敤鍝佺墝绯诲垪ID闆嗗悎锛岋紙[1],[2]锛�")
+    private String serialIds;
 
     @ApiModelProperty(value = "涓�绾у垎绫�")
     @ExcelColumn(name="涓�绾у垎绫�")
     private String parentCategoryId;
+
+    @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1")
+    private BigDecimal deductRata;
+
+
+    @ApiModelProperty(value = "sku閲嶉噺", hidden = true)
+    @TableField(exist = false)
+    private BigDecimal weight;
+    @ApiModelProperty(value = "sku閲戦", hidden = true)
+    @TableField(exist = false)
+    private BigDecimal skuPrice;
+
+    @ApiModelProperty(value = "sku鎬婚噾棰�", hidden = true)
+    @TableField(exist = false)
+    private BigDecimal skuAmount;
+
+    @ApiModelProperty(value = "skuId", hidden = true)
+    @TableField(exist = false)
+    private Integer skuId;
 
     @ApiModelProperty(value = "鍟嗗搧杞挱鍥�", example = "1")
     @TableField(exist = false)
@@ -150,11 +177,16 @@
     @ApiModelProperty(value = "tab鍒囨崲鐘舵��;1鍏ㄩ儴锛�2锛屽凡鍞絼锛�3鍥炴敹")
     @TableField(exist = false)
     private Integer  tabStatus;
-
+    @ApiModelProperty(value = "鍗曚綅")
+    @TableField(exist = false)
+    private String unitName;
 
     @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
     @TableField(exist = false)
     private List<Sku>  skuList;
+    @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
+    @TableField(exist = false)
+    private List<Labels>  brandList;
 
     @ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
     @TableField(exist = false)

--
Gitblit v1.9.3