Merge branch 'master-customer-management' into dev

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

@@ -322,7 +322,7 @@ from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
         ) as `sell` on sell.user_id=saff.userId
         order by sell.sellAmount desc
     </select>
-    <select id="getUserInfo" resultMap="AppUserVoMap">
+    <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
     left join  app_user_detail d
     on d.userid = l.id