From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 7 ++++++-
1 files changed, 6 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 37e0564..8f22628 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="鎸囧浠凤紙鍏冿級")
@@ -111,7 +111,12 @@
@ApiModelProperty(value = "鍒嗙被鍔犱环绯绘暟", example = "1")
@ExcelColumn(name="鍒嗙被鍔犱环绯绘暟")
+ @TableField(exist = false)
private BigDecimal cateRatePrice;
+ @ApiModelProperty(value = "鍏ㄨ矾寰勫湴鍧�")
+ @TableField(exist = false)
+ private String fullImgUrl;
+
}
--
Gitblit v1.9.3