Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

15 小时以前 812f2de34b5713c4da08932d95e634de81e9b248

 src/main/resources/mapper/system/SysUserMapper.xml

@@ -187,7 +187,7 @@
        where email = #{email}
          and del_flag = '0' limit 1
    </select>
    <select id="selectUserByIds" resultType="com.ruoyi.project.system.domain.SysUser">
    <select id="selectUserByIds" resultMap="SysUserResult">
        <include refid="selectUserVo"/>
        <where>
            <if test="userIds != null and userIds.size > 0">