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/CateParam.java | 10 +++++++++-
1 files changed, 9 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 29c36f8..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
@@ -63,6 +63,12 @@
@ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤", example = "1")
@ExcelColumn(name="鐘舵�� 0鍚敤 1绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "鏄惁閫夐」 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁閫夐」 0鍚� 1鏄�")
+ private Integer isselect;
+ @ApiModelProperty(value = "鏄惁鏄剧ず 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鏄剧ず 0鍚� 1鏄�")
+ private Integer isshow;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
@@ -72,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