From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
index d78ec28..3bddf6f 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -52,6 +52,8 @@
<result property="occupation" column="occupation"/>
<result property="assessannex" column="assessannex"/>
<result property="relativeRemark" column="relative_remark"/>
+ <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/>
+ <result property="relativeidcardno" column="relativeidcardno"/>
</resultMap>
<sql id="selectServiceRelativesconfirmationVo">
@@ -297,13 +299,16 @@
sr.ResponsibleUserID as responsibleuserid,
sr.CoordinatedUserIDO as coordinateduserido,
sr.CoordinatedUserNameO as coordinatedusernameo,
- sr.CoordinatedUserNameT as coordinateduseridt,
+ sr.CoordinatedUserNameT as coordinatedusernamet,
sr.ResponsibleUserID as responsibleuserid,
sr.nation as nation,
sr.occupation as occupation,
sr.relative_remark as relativeRemark,
sr.assessannex as assessannex,
- sr.education as education
+ sr.education as education,
+ sr.relativeconfirmationsignname,
+ sr.relativeidcardno,
+ sr.state
FROM service_donatebaseinfo sd
LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
AND sr.del_flag = 0
@@ -337,4 +342,5 @@
<if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
</select>
+
</mapper>
--
Gitblit v1.9.3