From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/Category.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Category.java b/server/service/src/main/java/com/doumee/dao/business/model/Category.java
index 0c67dbb..3768bad 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Category.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Category.java
@@ -103,11 +103,11 @@
@TableField(exist = false)
private List<CateParam> paramList;
- @ApiModelProperty(value = "灞炴��1 鍒楄〃鍊�")
+ @ApiModelProperty(value = "灞炴��1 鍒楄〃鍊�" ,hidden = true)
@TableField(exist = false)
private List<CateAttr> attrFirstList;
- @ApiModelProperty(value = "灞炴��2 鍒楄〃鍊�")
+ @ApiModelProperty(value = "灞炴��2 鍒楄〃鍊�" ,hidden = true)
@TableField(exist = false)
private List<CateAttr> attrSecondList;
@@ -115,4 +115,11 @@
@TableField(exist = false)
private List<CateBudget> budgetList;
+ @ApiModelProperty(value = "灞炴��1 鍒楄〃鍊�")
+ @TableField(exist = false)
+ private List<CateParamSelect> cateParamFirstList;
+
+ @ApiModelProperty(value = "灞炴��2 鍒楄〃鍊�")
+ @TableField(exist = false)
+ private List<CateParamSelect> cateParamSecondList;
}
--
Gitblit v1.9.3