From cf9b836069e0a76571c6611642b2d7abb0586a2b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 18:20:40 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 470c3cd..0dbb30c 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
@@ -83,7 +83,7 @@
@ApiModelProperty(value = "鎵�灞炲搧鐗岀紪鐮�(base_brand)", example = "1")
@ExcelColumn(name="鎵�灞炲搧鐗宯ame")
@TableField(exist = false)
- private Integer brandName;
+ private String brandName;
@ApiModelProperty(value = "鎸囧浠凤紙鍏冿級", example = "1")
@ExcelColumn(name="鎸囧浠凤紙鍏冿級")
@@ -109,4 +109,10 @@
@ExcelColumn(name="鍏宠仈婧愭暟鎹紪鐮�")
private String baseDataId;
+ @ApiModelProperty(value = "鍒嗙被鍔犱环绯绘暟", example = "1")
+ @ExcelColumn(name="鍒嗙被鍔犱环绯绘暟")
+ @TableField(exist = false)
+ private BigDecimal cateRatePrice;
+
+
}
--
Gitblit v1.9.3