init

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/PageInfo.java

@@ -0,0 +1,18 @@
+package com.ruoyi.xq.dto.app;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class PageInfo<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 列表数据
+     */
+    private List<T> rows;
+
+
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/common/IdsReq.java

@@ -0,0 +1,10 @@
+package com.ruoyi.xq.dto.app.common;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class IdsReq {
+    @Schema(description = "id逗号分割")
+    private String ids;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/common/UserPicturesDTO.java

@@ -0,0 +1,18 @@
+package com.ruoyi.xq.dto.app.common;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UserPicturesDTO {
+    @Schema(description = "id")
+    private Long id;
+    @Schema(description = "用户ID")
+    private Long userId;
+    @Schema(description = "用户号")
+    private String usercode;
+    @Schema(description = "照片")
+    private String picture;
+    @Schema(description = "1-待审核 2-审核成功 3-审核失败")
+    private Integer auditStatus;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/dynamic/AddDynamicReq.java

@@ -0,0 +1,17 @@
+package com.ruoyi.xq.dto.app.dynamic;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AddDynamicReq {
+
+    @Schema(hidden = true)
+    private Long userId;
+    @Schema(description = "动态内容")
+    private String content;
+    @Schema(description = "动态图片")
+    private List<String> imageList;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/dynamic/DynamicListVo.java

@@ -0,0 +1,56 @@
+package com.ruoyi.xq.dto.app.dynamic;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class DynamicListVo {
+
+    @Schema(description = "动态ID")
+    private Long id;
+    @Schema(description = "用户ID")
+    private Long userId;
+
+    @Schema(description = "头像")
+    private String avatar;
+
+    @Schema(description = "昵称")
+    private String nickname;
+
+    @Schema(description = "年龄")
+    private Integer age;
+
+    private LocalDate birthday;
+    @Schema(description = "性别 0-未知 1-女 2-男")
+    private Integer gender;
+    /**
+     * 居住城市
+     */
+    @Schema(description = "居住城市")
+    private String residenceCity;
+    /**
+     * 学历
+     */
+    @Schema(description = "学历")
+    private Integer education;
+    /**
+     * 职业
+     */
+    @Schema(description = "职业")
+    private Integer profession;
+
+    @Schema(description = "内容")
+    private String content;
+
+    @Schema(description = "图片列表")
+    private List<String> imageList;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/dynamic/DynamicQuery.java

@@ -0,0 +1,16 @@
+package com.ruoyi.xq.dto.app.dynamic;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class DynamicQuery {
+
+    @Schema(description = "性别 1-女 2-男")
+    private Integer gender;
+
+    @Schema(description = "居住城市")
+    private String residenceCity;
+
+
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/login/LoginUser.java

@@ -18,4 +18,6 @@ public class LoginUser {
     private String password;
     @Schema(description = "登陆验证码")
     private String code;
+    @Schema(description = "邀请码")
+    private String inviteCode;
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/login/LoginVo.java

@@ -1,6 +1,6 @@
 package com.ruoyi.xq.dto.app.login;
 
-import com.ruoyi.xq.dto.app.user.CurrentUserInfoVo;
+import com.ruoyi.xq.dto.app.user.vo.CurrentUserInfoVo;
 import lombok.Data;
 
 @Data

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/AddPicturesReq.java

@@ -0,0 +1,8 @@
+package com.ruoyi.xq.dto.app.user;
+
+import lombok.Data;
+
+@Data
+public class AddPicturesReq {
+    private String picture;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateAvatarReq.java

@@ -0,0 +1,10 @@
+package com.ruoyi.xq.dto.app.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UpdateAvatarReq {
+    @Schema(description = "头像")
+    private String avatar;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateBaseInfoReq.java

@@ -0,0 +1,70 @@
+package com.ruoyi.xq.dto.app.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class UpdateBaseInfoReq {
+    @Schema(description = "为谁征婚")
+    private Integer forPersonals;
+    @Schema(description = "性别 0-未知 1-女 2-男")
+    private Integer gender;
+    @Schema(description = "生日")
+    private LocalDate birthday;
+    /**
+     * 身高
+     */
+    @Schema(description = "身高")
+    private Integer height;
+    /**
+     * 体重
+     */
+    @Schema(description = "体重")
+    private Integer weight;
+    /**
+     * 居住地
+     */
+    @Schema(description = "居住地")
+    private String residence;
+    /**
+     * 户籍地
+     */
+    @Schema(description = "户籍地")
+    private String address;
+    /**
+     * 学历
+     */
+    @Schema(description = "学历")
+    private Integer education;
+    /**
+     * 婚况
+     */
+    @Schema(description = "婚况")
+    private Integer marriage;
+    /**
+     * 职业
+     */
+    @Schema(description = "职业")
+    private Integer profession;
+    /**
+     * 年收入
+     */
+    @Schema(description = "年收入")
+    private Integer annualIncome;
+
+    /**
+     * 住房情况
+     */
+    @Schema(description = "住房情况")
+    private Integer housingStatus;
+    /**
+     * 购车情况
+     */
+    @Schema(description = "购车情况")
+    private Integer carStatus;
+
+    @Schema(description = "昵称")
+    private String nickname;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateRemarkReq.java

@@ -0,0 +1,10 @@
+package com.ruoyi.xq.dto.app.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UpdateRemarkReq {
+    @Schema(description = "备注")
+    private String remark;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserAuthInfoReq.java

@@ -0,0 +1,49 @@
+package com.ruoyi.xq.dto.app.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UpdateUserAuthInfoReq {
+    @Schema(description = "提交学历认证")
+    private Boolean pushEducationAuth;
+    /**
+     * 学历照片
+     */
+    @Schema(description = "学历照片")
+    private String educationPic;
+    @Schema(description = "提交工作认证")
+    private Boolean pushJobAuthBoo;
+    /**
+     * 工作认证类型
+     */
+    @Schema(description = "工作认证类型")
+    private Integer jobAuthType;
+    /**
+     * 工作照片
+     */
+    @Schema(description = "工作照片")
+    private String jobPic;
+    @Schema(description = "提交车辆认证")
+    private Boolean pushCarAuth;
+
+    /**
+     * 车辆照片
+     */
+    @Schema(description = "车辆照片")
+    private String carPic;
+    @Schema(description = "提交房子认证")
+    private Boolean pushHouseAuth;
+    /**
+     * 房子照片
+     */
+    @Schema(description = "房子照片")
+    private String housePic;
+    @Schema(description = "提交婚况认证")
+    private Boolean pushMarriageAuth;
+    /**
+     * 婚况照片
+     */
+    @Schema(description = "婚况照片")
+    private String marriagePic;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java

@@ -0,0 +1,97 @@
+package com.ruoyi.xq.dto.app.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * 用户详细资料
+ * <p>created on 2024/3/5 10:31</p>
+ * @author 77
+ */
+@Data
+public class UpdateUserFullInfoReq {
+    @Schema(description = "昵称")
+    private String nickname;
+    @Schema(description = "生日")
+    private LocalDate birthday;
+    @Schema(description = "生肖")
+    private Integer zodiac;
+    @Schema(description = "星座")
+    private Integer sign;
+    @Schema(description = "身高")
+    private Integer height;
+    @Schema(description = "体重")
+    private Integer weight;
+    @Schema(description = "体型")
+    private Integer somatotype;
+
+    @Schema(description = "居住地")
+    private String residence;
+    @Schema(description = "户籍地")
+    private String address;
+    @Schema(description = "学历")
+    private Integer education;
+    @Schema(description = "婚况")
+    private Integer marriage;
+    @Schema(description = "职业")
+    private Integer profession;
+    @Schema(description = "年收入")
+    private Integer annualIncome;
+    @Schema(description = "公司性质")
+    private Integer companyNature;
+    @Schema(description = "为谁征婚")
+    private Integer forPersonals;
+
+    @Schema(description = "住房情况")
+    private Integer housingStatus;
+    @Schema(description = "购车情况")
+    private Integer carStatus;
+    @Schema(description = "是否吸烟")
+    private Integer smokeStatus;
+    @Schema(description = "是否喝酒")
+    private Integer drinkStatus;
+    @Schema(description = "民族")
+    private String nation;
+    @Schema(description = "有没有小孩")
+    private Integer childStatus;
+    @Schema(description = "家庭背景")
+    private Integer familyBackground;
+    @Schema(description = "家中排行")
+    private Integer familyRanking;
+    @Schema(description = "是否接受异地恋")
+    private Integer loveAtDistance;
+    @Schema(description = "何时结婚")
+    private Integer whenMarriage;
+    @Schema(description = "是否要小孩")
+    private Integer wantChild;
+    @Schema(description = "愿与对方父母同住")
+    private Integer liveAtParent;
+    @Schema(description = "交友目的")
+    private Integer findTag;
+    @Schema(description = "毕业院校")
+    private String graduateSchool;
+    @Schema(description = "兴趣爱好")
+    private String hobbys;
+    @Schema(description = "择偶条件-年龄")
+    private String filterAge;
+    @Schema(description = "择偶条件-身高")
+    private String filterHeight;
+    @Schema(description = "择偶条件-体型")
+    private String filterSomatotype;
+    @Schema(description = "择偶条件-婚况")
+    private String filterMarriage;
+    @Schema(description = "择偶条件-学历")
+    private Integer filterEducation;
+    @Schema(description = "择偶条件-地区")
+    private String filterResidence;
+    @Schema(description = "择偶条件-年收入")
+    private Integer filterAnnualIncome;
+    @Schema(description = "择偶条件-小孩情况")
+    private Integer filterChildStatus;
+    @Schema(description = "择偶条件-住房情况")
+    private Integer filterHousingStatus;
+    @Schema(description = "择偶条件-购车情况")
+    private Integer filterCarStatus;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/AvatarMinAuditDTO.java

@@ -0,0 +1,12 @@
+package com.ruoyi.xq.dto.app.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class AvatarMinAuditDTO {
+
+    private String avatar;
+    @Schema(description = "1-待审核 2-审核成功 3-审核失败")
+    private Integer auditStatus;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java

@@ -0,0 +1,236 @@
+package com.ruoyi.xq.dto.app.user.vo;
+
+import com.ruoyi.xq.dto.app.common.UserPicturesDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * 用户详细资料
+ * <p>created on 2024/3/5 10:31</p>
+ * @author 77
+ */
+@Data
+public class CurrentUserFullInfoVo {
+    @Schema(description = "用户ID")
+    private Long userId;
+    @Schema(description = "用户编号")
+    private Long usercode;
+    @Schema(description = "用户头像")
+    private AvatarMinAuditDTO avatarAudit;
+    @Schema(description = "相册")
+    private List<UserPicturesDTO> userPicturesList;
+    @Schema(description = "自我描述")
+    private RemarkMinAuditDTO remarkAudit;
+    @Schema(description = "昵称")
+    private String nickname;
+    @Schema(description = "性别 0-未知 1-女 2-男")
+    private Integer gender;
+    @Schema(description = "手机")
+    private String mobile;
+    /**
+     * 生日
+     */
+    @Schema(description = "生日")
+    private LocalDate birthday;
+    /**
+     * 生肖
+     */
+    @Schema(description = "生肖")
+    private Integer zodiac;
+    /**
+     * 星座
+     */
+    @Schema(description = "星座")
+    private Integer sign;
+    /**
+     * 身高
+     */
+    @Schema(description = "身高")
+    private Integer height;
+    /**
+     * 体重
+     */
+    @Schema(description = "体重")
+    private Integer weight;
+    /**
+     * 体型
+     */
+    @Schema(description = "体型")
+    private Integer somatotype;
+
+    /**
+     * 居住地
+     */
+    @Schema(description = "居住地")
+    private String residence;
+    /**
+     * 户籍地
+     */
+    @Schema(description = "户籍地")
+    private String address;
+    /**
+     * 学历
+     */
+    @Schema(description = "学历")
+    private Integer education;
+    /**
+     * 婚况
+     */
+    @Schema(description = "婚况")
+    private Integer marriage;
+    /**
+     * 职业
+     */
+    @Schema(description = "职业")
+    private Integer profession;
+    /**
+     * 年收入
+     */
+    @Schema(description = "年收入")
+    private Integer annualIncome;
+    /**
+     * 公司性质
+     */
+    @Schema(description = "公司性质")
+    private Integer companyNature;
+    /**
+     * 为谁征婚
+     */
+    @Schema(description = "为谁征婚")
+    private Integer forPersonals;
+
+    /**
+     * 住房情况
+     */
+    @Schema(description = "住房情况")
+    private Integer housingStatus;
+    /**
+     * 购车情况
+     */
+    @Schema(description = "购车情况")
+    private Integer carStatus;
+    /**
+     * 是否吸烟
+     */
+    @Schema(description = "是否吸烟")
+    private Integer smokeStatus;
+    /**
+     * 是否喝酒
+     */
+    @Schema(description = "是否喝酒")
+    private Integer drinkStatus;
+    /**
+     * 民族
+     */
+    @Schema(description = "民族")
+    private String nation;
+    /**
+     * 有没有小孩
+     */
+    @Schema(description = "有没有小孩")
+    private Integer childStatus;
+    /**
+     * 家庭背景
+     */
+    @Schema(description = "家庭背景")
+    private Integer familyBackground;
+    /**
+     * 家中排行
+     */
+    @Schema(description = "家中排行")
+    private Integer familyRanking;
+    /**
+     * 是否接受异地恋
+     */
+    @Schema(description = "是否接受异地恋")
+    private Integer loveAtDistance;
+    /**
+     * 何时结婚
+     */
+    @Schema(description = "何时结婚")
+    private Integer whenMarriage;
+    /**
+     * 是否要小孩
+     */
+    @Schema(description = "是否要小孩")
+    private Integer wantChild;
+    /**
+     * 愿与对方父母同住
+     */
+    @Schema(description = "愿与对方父母同住")
+    private Integer liveAtParent;
+    /**
+     * 交友目的
+     */
+    @Schema(description = "交友目的")
+    private Integer findTag;
+    /**
+     * 毕业院校
+     */
+    @Schema(description = "毕业院校")
+    private String graduateSchool;
+    /**
+     * 兴趣爱好
+     */
+    @Schema(description = "兴趣爱好")
+    private String hobbys;
+    /**
+     * 择偶条件-年龄
+     */
+    @Schema(description = "择偶条件-年龄")
+    private String filterAge;
+    /**
+     * 择偶条件-身高
+     */
+    @Schema(description = "择偶条件-身高")
+    private String filterHeight;
+    /**
+     * 择偶条件-体型
+     */
+    @Schema(description = "择偶条件-体型")
+    private String filterSomatotype;
+    /**
+     * 择偶条件-婚况
+     */
+    @Schema(description = "择偶条件-婚况")
+    private String filterMarriage;
+    /**
+     * 择偶条件-学历
+     */
+    @Schema(description = "择偶条件-学历")
+    private Integer filterEducation;
+    /**
+     * 择偶条件-地区
+     */
+    @Schema(description = "择偶条件-地区")
+    private String filterResidence;
+    /**
+     * 择偶条件-年收入
+     */
+    @Schema(description = "择偶条件-年收入")
+    private Integer filterAnnualIncome;
+    /**
+     * 择偶条件-小孩情况
+     */
+    @Schema(description = "择偶条件-小孩情况")
+    private Integer filterChildStatus;
+    /**
+     * 择偶条件-住房情况
+     */
+    @Schema(description = "择偶条件-住房情况")
+    private Integer filterHousingStatus;
+    /**
+     * 择偶条件-购车情况
+     */
+    @Schema(description = "择偶条件-购车情况")
+    private Integer filterCarStatus;
+
+    /**
+     * 状态 0-可用  1-不可用
+     */
+    @Schema(description = "状态 0-可用  1-不可用")
+    private Integer status;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java

@@ -1,26 +1,21 @@
-package com.ruoyi.xq.dto.app.user;
+package com.ruoyi.xq.dto.app.user.vo;
 
+import com.ruoyi.xq.dto.app.common.UserPicturesDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @Schema(description = "当前用户模型")
 public class CurrentUserInfoVo {
-
     @Schema(description = "用户ID")
     private Long userId;
-
-    @Schema(description = "邀请人ID")
-    private Long inviteId;
+    @Schema(description = "用户编号")
+    private String usercode;
     @Schema(description = "用户类型 0-普通用户 1-内部用户")
     private Integer type;
-    /**
-     * 用户号/ID号
-     */
-    @Schema(description = "蜜瓜号")
-    private String usercode;
     /**
      * 昵称
      */
@@ -36,58 +31,42 @@ public class CurrentUserInfoVo {
      */
     @Schema(description = "头像")
     private String avatar;
-    /**
-     * 头像状态，0 系统默认头像，1 用户自定义头像
-     */
-    @Schema(description = "头像状态 0-默认 1-自定义")
-    private Integer avatarState;
     /**
      * 性别   0 未知  1  女  2 男
      */
     @Schema(description = "性别 0-未知 1-女 2-男")
     private Integer gender;
-    /**
-     *
-     */
     @Schema(description = "生日")
     private LocalDate birthday;
     @Schema(description = "年龄")
-    private Integer age = 18;
-    /**
-     * 城市
-     */
-    @Schema(description = "城市ID")
-    private Integer cityId;
-    @Schema(description = "城市")
-    private String city;
-    /**
-     * 是否是播主  0 否  1 是
-     */
-    @Schema(description = "主播 0-否 1-是")
-    private Integer isAnchor;
-    /**
-     * 开启视频接听   0 未开启  1 已开启
-     */
-    @Schema(description = "开启视频接听 0-否 1-是")
-    private Integer openVideoStatus;
-
+    private Integer age;
+//    @Schema(description = "城市ID")
+//    private Integer cityId;
+    @Schema(description = "居住城市")
+    private String residenceCity;
     /**
      * 状态  0 可用  1 不可用
      */
     @Schema(description = "可用状态 0-可用 1-封禁")
     private Integer status;
-    /**
-     * 资料是否完成  0 未完成  1已完成
-     */
-    @Schema(description = "资料是否完成  0 未完成  1已完成")
-    private Integer finishStatus;
+    @Schema(description = "基础资料是否完成  0 未完成  1已完成")
+    private Integer finishBaseStatus;
 
     @Schema(description = "imToken")
     private String imToken;
 
+    @Schema(description = "交换微信次数")
+    private Integer wxExchangeNum = 0;
+
+    @Schema(description = "已认证数量")
+    private Integer alreadyAuthNum = 0;
+
+    @Schema(description = "最大认证数量")
+    private Integer maxAuthNum = 8;
+
     /**
      * 相册
      */
-//    @Schema(description = "相册")
-//    private List<UserAlbumDTO> userAlbumList;
+    @Schema(description = "相册")
+    private List<UserPicturesDTO> userPicturesList;
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java

@@ -0,0 +1,227 @@
+package com.ruoyi.xq.dto.app.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+public class HomeUserVo {
+
+
+
+
+    @Schema(description = "用户ID")
+    private Long userId;
+    @Schema(description = "用户编号")
+    private Long usercode;
+    @Schema(description = "用户头像")
+    private String avatar;
+    @Schema(description = "相册")
+    private List<String> userPictureList;
+    @Schema(description = "自我描述")
+    private String remark;
+    @Schema(description = "昵称")
+    private String nickname;
+    @Schema(description = "性别 0-未知 1-女 2-男")
+    private Integer gender;
+    /**
+     * 生日
+     */
+    @Schema(description = "生日")
+    private LocalDate birthday;
+    /**
+     * 生肖
+     */
+    @Schema(description = "生肖")
+    private Integer zodiac;
+    /**
+     * 星座
+     */
+    @Schema(description = "星座")
+    private Integer sign;
+    /**
+     * 身高
+     */
+    @Schema(description = "身高")
+    private Integer height;
+    /**
+     * 体重
+     */
+    @Schema(description = "体重")
+    private Integer weight;
+    /**
+     * 体型
+     */
+    @Schema(description = "体型")
+    private Integer somatotype;
+
+    /**
+     * 居住地
+     */
+    @Schema(description = "居住地")
+    private String residence;
+    /**
+     * 户籍地
+     */
+    @Schema(description = "户籍地")
+    private String address;
+    /**
+     * 学历
+     */
+    @Schema(description = "学历")
+    private Integer education;
+    /**
+     * 婚况
+     */
+    @Schema(description = "婚况")
+    private Integer marriage;
+    /**
+     * 职业
+     */
+    @Schema(description = "职业")
+    private Integer profession;
+    /**
+     * 年收入
+     */
+    @Schema(description = "年收入")
+    private Integer annualIncome;
+    /**
+     * 公司性质
+     */
+    @Schema(description = "公司性质")
+    private Integer companyNature;
+    /**
+     * 为谁征婚
+     */
+    @Schema(description = "为谁征婚")
+    private Integer forPersonals;
+
+    /**
+     * 住房情况
+     */
+    @Schema(description = "住房情况")
+    private Integer housingStatus;
+    /**
+     * 购车情况
+     */
+    @Schema(description = "购车情况")
+    private Integer carStatus;
+    /**
+     * 是否吸烟
+     */
+    @Schema(description = "是否吸烟")
+    private Integer smokeStatus;
+    /**
+     * 是否喝酒
+     */
+    @Schema(description = "是否喝酒")
+    private Integer drinkStatus;
+    /**
+     * 民族
+     */
+    @Schema(description = "民族")
+    private String nation;
+    /**
+     * 有没有小孩
+     */
+    @Schema(description = "有没有小孩")
+    private Integer childStatus;
+    /**
+     * 家庭背景
+     */
+    @Schema(description = "家庭背景")
+    private Integer familyBackground;
+    /**
+     * 家中排行
+     */
+    @Schema(description = "家中排行")
+    private Integer familyRanking;
+    /**
+     * 是否接受异地恋
+     */
+    @Schema(description = "是否接受异地恋")
+    private Integer loveAtDistance;
+    /**
+     * 何时结婚
+     */
+    @Schema(description = "何时结婚")
+    private Integer whenMarriage;
+    /**
+     * 是否要小孩
+     */
+    @Schema(description = "是否要小孩")
+    private Integer wantChild;
+    /**
+     * 愿与对方父母同住
+     */
+    @Schema(description = "愿与对方父母同住")
+    private Integer liveAtParent;
+    /**
+     * 交友目的
+     */
+    @Schema(description = "交友目的")
+    private Integer findTag;
+    /**
+     * 毕业院校
+     */
+    @Schema(description = "毕业院校")
+    private String graduateSchool;
+    /**
+     * 兴趣爱好
+     */
+    @Schema(description = "兴趣爱好")
+    private String hobbys;
+    /**
+     * 择偶条件-年龄
+     */
+    @Schema(description = "择偶条件-年龄")
+    private String filterAge;
+    /**
+     * 择偶条件-身高
+     */
+    @Schema(description = "择偶条件-身高")
+    private String filterHeight;
+    /**
+     * 择偶条件-体型
+     */
+    @Schema(description = "择偶条件-体型")
+    private String filterSomatotype;
+    /**
+     * 择偶条件-婚况
+     */
+    @Schema(description = "择偶条件-婚况")
+    private String filterMarriage;
+    /**
+     * 择偶条件-学历
+     */
+    @Schema(description = "择偶条件-学历")
+    private Integer filterEducation;
+    /**
+     * 择偶条件-地区
+     */
+    @Schema(description = "择偶条件-地区")
+    private String filterResidence;
+    /**
+     * 择偶条件-年收入
+     */
+    @Schema(description = "择偶条件-年收入")
+    private Integer filterAnnualIncome;
+    /**
+     * 择偶条件-小孩情况
+     */
+    @Schema(description = "择偶条件-小孩情况")
+    private Integer filterChildStatus;
+    /**
+     * 择偶条件-住房情况
+     */
+    @Schema(description = "择偶条件-住房情况")
+    private Integer filterHousingStatus;
+    /**
+     * 择偶条件-购车情况
+     */
+    @Schema(description = "择偶条件-购车情况")
+    private Integer filterCarStatus;
+
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/RemarkMinAuditDTO.java

@@ -0,0 +1,15 @@
+package com.ruoyi.xq.dto.app.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class RemarkMinAuditDTO {
+
+    @Schema(description = "备注")
+    private String remark;
+    @Schema(description = "正在审核中的备注")
+    private String auditRemark;
+    @Schema(description = "1-待审核 2-审核成功 3-审核失败")
+    private Integer auditStatus;
+}

ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/UserAuthInfoVo.java

@@ -0,0 +1,102 @@
+package com.ruoyi.xq.dto.app.user.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class UserAuthInfoVo {
+
+    @Schema(description = "用户Id")
+    private Long userId;
+    /**
+     * 用户号
+     */
+    @Schema(description = "用户编号")
+    private String usercode;
+    /**
+     * 实名认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "实名认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer cardNumAuth;
+    /**
+     * 身份证ID
+     */
+    @Schema(description = "身份证ID")
+    private String cardNumId;
+    /**
+     * 身份证ID
+     */
+    @Schema(description = "身份证名称")
+    private String cardNumName;
+    /**
+     * 手机认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "手机认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer phoneAuth;
+    /**
+     * 手机号
+     */
+    @Schema(description = "手机号")
+    private String phone;
+    /**
+     * 单身认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "单身认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer singlePersonAuth;
+    /**
+     * 学历认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "学历认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer educationAuth;
+    /**
+     * 学历照片
+     */
+    @Schema(description = "学历照片")
+    private String educationPic;
+    /**
+     * 工作认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "工作认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer jobAuth;
+    /**
+     * 工作认证类型
+     */
+    @Schema(description = "工作认证类型")
+    private Integer jobAuthType;
+    /**
+     * 工作照片
+     */
+    @Schema(description = "工作照片")
+    private String jobPic;
+    /**
+     * 车辆认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "车辆认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer carAuth;
+    /**
+     * 车辆照片
+     */
+    @Schema(description = "车辆照片")
+    private String carPic;
+    /**
+     * 房子认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "房子认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer houseAuth;
+    /**
+     * 房子照片
+     */
+    @Schema(description = "房子照片")
+    private String housePic;
+    /**
+     * 婚况认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败
+     */
+    @Schema(description = "婚况认证 0-待提交 1-审核中 2-审核通过（认证成功） 3-审核失败")
+    private Integer marriageAuth;
+    /**
+     * 婚况照片
+     */
+    @Schema(description = "婚况照片")
+    private String marriagePic;
+
+}