Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

2 天以前 afacb4a693c3b7e40ccdd55bc403850709ff8a34

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

@@ -180,6 +180,12 @@
         #{id}
      </foreach>
   </select>
   <select id="selectUserByNickName" resultType="com.ruoyi.project.system.domain.SysUser"
         parameterType="java.lang.String">
      <include refid="selectUserVo"/>
      where u.nick_name = #{nickName} and u.del_flag = '0'
      limit 1
   </select>

   <insert id="insertUser" parameterType="com.ruoyi.project.system.domain.SysUser" useGeneratedKeys="true" keyProperty="userId">
       insert into sys_user(