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/CateParam.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CateParam.java b/server/service/src/main/java/com/doumee/dao/business/model/CateParam.java
index 423b765..329305f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CateParam.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CateParam.java
@@ -78,5 +78,7 @@
@ExcelColumn(name="鎵�灞炲搧绫荤紪鐮�(鍏宠仈category琛�)")
private Integer categoryId;
-
+ @ApiModelProperty(value = "閫夋嫨鍝佺被鍙傛暟涓婚敭(鍏宠仈 base_cate_param 琛�)", example = "1")
+ @ExcelColumn(name="閫夋嫨鍝佺被鍙傛暟涓婚敭(鍏宠仈 base_cate_param 琛�)")
+ private Integer baseCateParamId;
}
--
Gitblit v1.9.3