init

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminMergeVo.java

@@ -0,0 +1,17 @@
+package com.ruoyi.xq.dto.admin.user;
+
+import com.ruoyi.xq.domain.UserPictures;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserPicturesAdminMergeVo implements Serializable {
+    private Long userId;
+    private String usercode;
+    private String nickname;
+    private String mobile;
+    private String avatar;
+    private List<UserPictures> userPictureList;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserPicturesAdminVo.java

@@ -7,6 +7,5 @@ import lombok.Data;
 public class UserPicturesAdminVo extends UserPictures {
     private String nickname;
     private String mobile;
-
     private String avatar;
 }