Merge remote-tracking branch 'origin/master'

zengh

2021-03-23 ba0f00cf00c2a5c693e9608a56d1f7d032f5e216

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -25,6 +25,8 @@
        <result column="role_id" property="roleId"/>
        <result column="dept_id" property="deptId"/>
        <result column="post_id" property="postId"/>
        <result column="online_status" property="online_status"/>
        <result column="channlId" property="channlId"/>
    </resultMap>

    <select id="selectUserPage" resultMap="userResultMap">