From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
index be604dc..2e8a6c1 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.constants.OperaType;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,7 +22,7 @@
*/
@Data
@ApiModel("绯荤粺鑿滃崟")
-public class SystemMenu implements Serializable {
+public class SystemMenu extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,6 +32,10 @@
@ApiModelProperty(value = "涓婁竴绾ц彍鍗�", example = "1")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Integer parentId;
+ @ApiModelProperty(value = "绫诲瀷 0鏈嶅姟涓績鑿滃崟 1椤堕儴瀵艰埅,榛樿 0", example = "1")
+ private Integer type;
+ @ApiModelProperty(value = "鍏宠仈绫诲瀷 0绯荤粺鍐呴儴鑿滃崟 1澶栭儴绯荤粺", example = "1")
+ private Integer linkType;
@ApiModelProperty(value = "鑿滃崟鍚嶇О")
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖", groups = {OperaType.Create.class, OperaType.Update.class})
@@ -69,5 +74,7 @@
@ApiModelProperty(value = "鏄惁宸插垹闄�", hidden = true)
private Boolean deleted;
+ @ApiModelProperty(value = "鍙傛暟" )
+ private String params;
}
--
Gitblit v1.9.3