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 |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 97ab626..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
@@ -62,7 +62,7 @@
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
     @ExcelColumn(name="鎺掑簭鐮�")
-    private Integer sortnum;
+    private Long sortnum;
 
     @ApiModelProperty(value = "鍥炬爣")
     @ExcelColumn(name="鍥炬爣")
@@ -90,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="鍟嗗搧璇︽儏")
@@ -122,5 +125,8 @@
     @TableField(exist = false)
     private List<Integer> idList;
 
-
+    @ApiModelProperty(value = "閲囪喘浠凤紙鍏冿級", example = "1")
+    @ExcelColumn(name="閲囪喘浠凤紙鍏冿級")
+    @TableField(exist = false)
+    private BigDecimal jdPrice;
 }

--
Gitblit v1.9.3