From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/Role.java | 8 +++++++-
1 files changed, 7 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 1a61592..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
@@ -1,7 +1,9 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -12,7 +14,6 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.util.Date;
@Data
@AllArgsConstructor
@@ -20,6 +21,7 @@
public class Role extends OrderBy implements Serializable {
@ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
private Integer id;
@ValueTableShow(1)
@@ -27,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