Merge remote-tracking branch 'origin/master'

zqy

9 天以前 bc679a9077a7ede5b61349645cbb5f411d703949

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -53,6 +53,9 @@
     */
    public SysUser selectUserByUserName(String userName);

    public List<SysUser> getUserByUserName(String userName);



    public SysUser selectUserByNickName(String nickName);