From 0444972925d67eb9e32c9b2d36f2eda24d2f58c2 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 04:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml b/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
index 0781ba4..52d25e5 100644
--- a/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
+++ b/febs-server/febs-server-system/src/main/resources/mapper/RoleMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cc.mrbird.febs.server.system.mapper.RoleMapper">
- <resultMap id="roleMap" type="role">
+ <resultMap id="roleMap" type="cc.mrbird.febs.common.core.entity.system.Role">
<!--
WARNING - @mbg.generated
-->
@@ -23,7 +23,7 @@
u.username = #{username}
</select>
- <select id="findRolePage" parameterType="role" resultType="role">
+ <select id="findRolePage" parameterType="cc.mrbird.febs.common.core.entity.system.Role" resultType="cc.mrbird.febs.common.core.entity.system.Role">
SELECT
r.role_id roleId,
r.role_name roleName,
@@ -42,4 +42,4 @@
r.role_id
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.8.0