From 9c06fb2da3250f7b8bfcb5a2b8bd227528af2678 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/Role.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Role.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Role.java
index dd691d7..912632d 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/Role.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Role.java
@@ -14,7 +14,6 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
@AllArgsConstructor
@@ -30,6 +29,10 @@
private String name;
@ValueTableShow(2)
+ @ApiModelProperty(value = "瑙掕壊鍒嗙被")
+ private Integer category;
+
+ @ValueTableShow(2)
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3