From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 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 29b5ed0..97a4a17 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
@@ -1,5 +1,6 @@
 package com.doumee.dao.business.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 绱犳潗搴�-鍟嗗搧淇℃伅琛�
@@ -32,7 +34,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +42,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -62,7 +62,7 @@
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
     @ExcelColumn(name="鎺掑簭鐮�")
-    private Integer sortnum;
+    private Long sortnum;
 
     @ApiModelProperty(value = "鍥炬爣")
     @ExcelColumn(name="鍥炬爣")
@@ -72,17 +72,30 @@
     @ExcelColumn(name="鎵�灞炲搧绫荤紪鐮�(base_category)")
     private Integer categoryId;
 
+    @ApiModelProperty(value = "鎵�灞炲搧绫荤紪鐮�(base_category)", example = "1")
+    @ExcelColumn(name="鎵�灞炲搧绫荤紪鐮�(base_category)")
+    @TableField(exist = false)
+    private String categoryName;
+
     @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
     @ExcelColumn(name="鎵�灞炲搧鐗岀紪鐮�(base_brand)")
     private Integer brandId;
+
+    @ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
+    @ExcelColumn(name="鎵�灞炲搧鐗宯ame")
+    @TableField(exist = false)
+    private String brandName;
 
     @ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
     @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="鍟嗗搧璇︽儏")
@@ -96,4 +109,24 @@
     @ExcelColumn(name="鍚嶇О鎷奸煶棣栧瓧姣�")
     private String shortPinyin;
 
+    @ApiModelProperty(value = "鍏宠仈婧愭暟鎹紪鐮�")
+    @ExcelColumn(name="鍏宠仈婧愭暟鎹紪鐮�")
+    private String baseDataId;
+
+    @ApiModelProperty(value = "鍒嗙被鍔犱环绯绘暟", example = "1")
+    @ExcelColumn(name="鍒嗙被鍔犱环绯绘暟")
+    @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