Merge remote-tracking branch 'origin/master'

luoyb

2021-02-17 2b71869efe32d2b8f0bc9351bec4d0b0ed8efcf0

 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>
</mapper>