From 8ee88e8c511b75f2b2e566c37b38209a0c35afa8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 11 九月 2023 16:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
index 86a4e9d..93ee05f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
@@ -12,6 +12,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* 绱犳潗搴�-鍝佺被淇℃伅琛�
@@ -89,8 +90,11 @@
@ExcelColumn(name="鍔犱环绯绘暟")
private BigDecimal priceRate;
- @ApiModelProperty(value = "鍥炬爣")
- @ExcelColumn(name="鍥炬爣")
+ @ApiModelProperty(value = "鍥炬爣 鍏ㄨ矾寰�")
@TableField(exist = false)
private String imgfullurl;
+
+ @ApiModelProperty(value = "鍝佺被鍙傛暟")
+ @TableField(exist = false)
+ private List<BaseCateParam> baseCateParamList;
}
--
Gitblit v1.9.3