From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java b/medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java
index 426ea0d..38895b6 100644
--- a/medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java
+++ b/medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java
@@ -1,14 +1,18 @@
package com.sinata.common.core.domain.entity;
-import java.util.Set;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.sinata.common.annotation.Excel;
import com.sinata.common.annotation.Excel.ColumnType;
import com.sinata.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.Set;
/**
* 角色表 sys_role
@@ -21,6 +25,7 @@
/** 角色ID */
@Excel(name = "角色序号", cellType = ColumnType.NUMERIC)
+ @TableId(type = IdType.AUTO)
private Long roleId;
/** 角色名称 */
@@ -53,22 +58,36 @@
private String delFlag;
/** 用户是否存在此角色标识 默认不存在 */
+ @TableField(exist = false)
private boolean flag = false;
/** 菜单组 */
+ @TableField(exist = false)
private Long[] menuIds;
/** 部门组（数据权限） */
+ @TableField(exist = false)
private Long[] deptIds;
/** 角色菜单权限 */
+ @TableField(exist = false)
private Set<String> permissions;
+ @TableField("MANAGE_ROLE_ID_STR")
+ private String manageRoleIdStr;
public SysRole()
{
}
+ public String getManageRoleIdStr() {
+ return manageRoleIdStr;
+ }
+
+ public void setManageRoleIdStr(String manageRoleIdStr) {
+ this.manageRoleIdStr = manageRoleIdStr;
+ }
+
public SysRole(Long roleId)
{
this.roleId = roleId;
--
Gitblit v1.7.1