Merge branch 'master-vehicle-memeber' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -163,6 +163,11 @@ public class AppUserManageVo {
      */
     private String memberName;
 
+    /**
+     * 会员类型
+     */
+    private String memberType;
+
     /**
      * 头像
      */

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

@@ -106,7 +106,8 @@
 	m.rent_free_days AS rentFreeDays,
 	m.crt_time AS timeOfMembership,
 	m.recent_recharge AS recentRecharge,
-	ml. NAME AS memberName,
+	ml.NAME AS memberName,
+        m.member_type,
 	aup. NAME AS `positionName`,
 	ul.username AS inviter,
 	IFNULL(pd.realname, pd.nickname) AS nameOfSuperior,