From 49997d450c87fea8a228a8c2827b51b51717f848 Mon Sep 17 00:00:00 2001 From: Derran Date: Thu, 5 Mar 2026 10:09:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=8F=E6=9C=88=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...geApplicantMarriageInformationContactApplyVo.java | 12 ++++++++++++ .../mica/MarriageInformationContactApplyDao.xml | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java index 4f79f10..92d83a9 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/mica/user/response/UserPageApplicantMarriageInformationContactApplyVo.java @@ -66,6 +66,18 @@ public class UserPageApplicantMarriageInformationContactApplyVo { @ApiModelProperty("电话") private String phone; + @ApiModelProperty("学历编码") + private Integer educationCode; + + @ApiModelProperty("学历中文") + private String education; + + @ApiModelProperty("收入编码") + private Integer incomeCode; + + @ApiModelProperty("收入中文") + private String income; + @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; diff --git a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml index 17e9b16..c3f734d 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/mica/MarriageInformationContactApplyDao.xml @@ -21,7 +21,11 @@ damica.`status`, damica.unlocked, damica.create_time, - daa.tid as phone + daa.tid as phone, + dami.education, + dami.education_code, + dami.income_code, + dami.income from da_marriage_information_contact_apply as damica LEFT JOIN da_marriage_information as dami on damica.target_mi_id=dami.id LEFT JOIN da_account as daa on daa.is_delete=0 and daa.type=2 and daa.user_id=damica.target_user_id