diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
index 43ab35b..ff366e5 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
@@ -41,9 +41,6 @@ public class SysRole extends BaseEntity
@Excel(name = "角色排序")
private Integer roleSort;
- /** 数据类型(1-组织类,2-区域类) */
- private Integer dataType;
-
/** 数据类型(1-全数据类, 2-组织类,3-商户类) */
private Integer roleType;
@@ -154,14 +151,6 @@ public class SysRole extends BaseEntity
this.roleSort = roleSort;
}
- public Integer getDataType() {
- return dataType;
- }
-
- public void setDataType(Integer dataType) {
- this.dataType = dataType;
- }
-
public Integer getRoleType() {
return roleType;
}
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
index fd43a20..f1cf515 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
@@ -27,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_type, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+ select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
r.company_id, r.status, r.del_flag, r.create_time, r.remark, r.is_built_in, r.area_id, role_type
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
@@ -116,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
role_key,
role_sort,
role_type,
- data_type,
data_scope,
menu_check_strictly,
dept_check_strictly,
@@ -133,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{roleKey},
#{roleSort},
#{roleType},
- #{dataType},
#{dataScope},
#{menuCheckStrictly},
#{deptCheckStrictly},
@@ -154,7 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
role_key = #{roleKey},
role_sort = #{roleSort},
role_type = #{roleType},
- data_type = #{dataType},
data_scope = #{dataScope},
menu_check_strictly = #{menuCheckStrictly},
dept_check_strictly = #{deptCheckStrictly},