Merge branch 'master-customer-management' into dev

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

@@ -110,7 +110,7 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
 
         appStaffUser.setSuId(superAppUserVo.getUserid());
         appStaffUser.setSuPhone(superAppUserVo.getUsername());
-        appStaffUser.setUid(userInfoById.getUserid());
+        appStaffUser.setUid(staffUserDTO.getUid());
         appStaffUser.setUName(StringUtil.isEmpty(userInfoById.getRealname()) ? userInfoById.getNickname() : userInfoById.getRealname());
         appStaffUser.setPhone(userInfoById.getUsername());
         appStaffUser.setStatus(1);

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -323,7 +323,7 @@ from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
         order by sell.sellAmount desc
     </select>
     <select id="getUser" resultMap="AppUserVoMap">
-    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    select  l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
      where l.id = #{userId}  limit 1