From 0ebb006ea17307cbd9d681f45467f8f49715a5fb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 14 九月 2023 16:52:01 +0800
Subject: [PATCH] 解决冲突
---
server/service/src/main/resources/mappers/SystemRoleMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index e2851b9..ea4849f 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -16,7 +16,7 @@
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemUserDTO" resultMap="SystemRoleListVO">
SELECT
- role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,
+ role.ID, role.`CODE`, role.`NAME`, role.`REMARK`, role.`FIXED`, role.`CREATE_TIME`, role.`UPDATE_TIME`,role.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
FROM SYSTEM_ROLE role
--
Gitblit v1.9.3