Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -24,6 +24,7 @@ public class BaseUserMemberExportVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
     private String username;
+    private String memberName;
     private Integer memberLevel;
     private Integer totalNumber;
     private Integer rentFreeDays;