From c441ee63996286f6e6bd92ecd51dbf2239d2d8ef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
index 49cbd8f..4129a88 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
@@ -1,12 +1,12 @@
package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
import java.io.Serializable;
import java.util.Date;
@@ -23,6 +23,9 @@
@EqualsAndHashCode(callSuper = false)
@TableName("ums_role")
@ApiModel(value="UmsRole瀵硅薄", description="鍚庡彴鐢ㄦ埛瑙掕壊琛�")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class UmsRole implements Serializable {
private static final long serialVersionUID=1L;
@@ -32,6 +35,9 @@
@ApiModelProperty(value = "鍚嶇О")
private String name;
+
+ @ApiModelProperty(value = "瑙掕壊绫诲瀷")
+ private Long type;
@ApiModelProperty(value = "鎻忚堪")
private String description;
@@ -47,5 +53,8 @@
private Integer sort;
+ @ApiModelProperty(value = "瑙掕壊绫诲瀷鏂囨湰")
+ @TableField(exist = false)
+ private String typeText;
}
--
Gitblit v1.8.0