From 75aa42c51ae2a63d7c1e5e813c0a88fd303bdbf4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 03 一月 2025 18:04:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee/master'
---
medicalWaste-common/src/main/java/com/sinata/common/core/domain/entity/SysRole.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 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..333fc80 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,52 @@
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;
+ /**
+ * 可管理角色id
+ */
+ @TableField("MANAGE_ROLE_ID_STR")
+ private String manageRoleIdStr;
+ /**
+ * 小程序角色标志
+ */
+ @TableField("APPLET_FLAG")
+ private Integer appletFlag;
public SysRole()
{
}
+ public Integer getAppletFlag() {
+ return appletFlag;
+ }
+
+ public void setAppletFlag(Integer appletFlag) {
+ this.appletFlag = appletFlag;
+ }
+
+ public String getManageRoleIdStr() {
+ return manageRoleIdStr;
+ }
+
+ public void setManageRoleIdStr(String manageRoleIdStr) {
+ this.manageRoleIdStr = manageRoleIdStr;
+ }
+
public SysRole(Long roleId)
{
this.roleId = roleId;
--
Gitblit v1.7.1