From 14b70bacd63f6b136612cf70b160777142e2a996 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 十月 2024 10:14:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 23 +++++++++++++++++++----
1 files changed, 19 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 37e0564..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)")
@@ -83,15 +84,18 @@
@ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
@ExcelColumn(name="鎵�灞炲搧鐗宯ame")
@TableField(exist = false)
- private Integer brandName;
+ 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="鍟嗗搧璇︽儏")
@@ -111,7 +115,18 @@
@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