From 691cbf9350a6e98bfeb3cc2274906da75466bf1d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 九月 2023 09:08:16 +0800
Subject: [PATCH] 销售价

---
 server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index 0dbb30c..ab188eb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 绱犳潗搴�-鍟嗗搧淇℃伅琛�
@@ -74,7 +75,7 @@
     @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
     @ExcelColumn(name="鎵�灞炲搧绫荤紪鐮�(base_category)")
     @TableField(exist = false)
-    private Integer categoryName;
+    private String categoryName;
 
     @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
     @ExcelColumn(name="鎵�灞炲搧鐗岀紪鐮�(base_brand)")
@@ -89,9 +90,12 @@
     @ExcelColumn(name="鎸囧浠凤紙鍏冿級")
     private BigDecimal zdPrice;
 
-    @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
-    @ExcelColumn(name="鍏ユ墜浠锋牸锛堝厓锛�")
+    @ApiModelProperty(value = "閿�鍞环鏍硷紙鍏冿級", example = "1")
+    @ExcelColumn(name="閿�鍞环鏍硷紙鍏冿級")
     private BigDecimal price;
+    @ApiModelProperty(value = "鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�", example = "1")
+    @ExcelColumn(name="鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�")
+    private Integer origin;
 
     @ApiModelProperty(value = "鍟嗗搧璇︽儏")
     @ExcelColumn(name="鍟嗗搧璇︽儏")
@@ -114,5 +118,15 @@
     @TableField(exist = false)
     private BigDecimal cateRatePrice;
 
+    @ApiModelProperty(value = "鍏ㄨ矾寰勫湴鍧�")
+    @TableField(exist = false)
+    private String fullImgUrl;
+    @ApiModelProperty(value = "缂栫爜闆嗗悎")
+    @TableField(exist = false)
+    private List<Integer> idList;
 
+    @ApiModelProperty(value = "閲囪喘浠凤紙鍏冿級", example = "1")
+    @ExcelColumn(name="閲囪喘浠凤紙鍏冿級")
+    @TableField(exist = false)
+    private BigDecimal jdPrice;
 }

--
Gitblit v1.9.3