Merge branch 'master_position' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -66,13 +66,13 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }
-        /*AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+       /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
         }*/
-
-        AppUserVo appUserVo=userDetailBiz.getUserInfoById(parentId);
+        AppUserVo  appUserVo=userDetailBiz.getUserInfoById(parentId);
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
             return;