Merge remote-tracking branch 'origin/master'

zqy

9 天以前 bc679a9077a7ede5b61349645cbb5f411d703949

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java

@@ -279,7 +279,7 @@
                return error("新增祖先1'" + usa.getNickName() + "'失败，登录账号已存在");
            }

            us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
            usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
            userService.insertUser(usa);