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/ServiceDeathinfoMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
index 65162c8..af68ab4 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDeathinfoMapper.xml
@@ -49,7 +49,13 @@
update_by,
update_time,
judgment_description,
- ext_content
+ ext_content,
+ state,
+ heartDeathTime
+ heartDeathReason
+ heartDeathJudgeDoctO
+ heartDeathJudgeDoctT
+ heartDeathJudgeAnnex
from service_deathinfo
</sql>
@@ -109,7 +115,13 @@
sdi.IsRestoreRemains as isrestoreremains,
sdi.RememberAnnex as rememberannex,
sdi.ResponsibleUserID as responsibleuserid,
- sdi.ResponsibleUserName as responsibleusername
+ sdi.ResponsibleUserName as responsibleusername,
+ sdi.state,
+ sdi.heartDeathTime as heartdeathtime,
+ sdi.heartDeathReason as heartdeathreason,
+ sdi.heartDeathJudgeDoctO as heartdeathjudgedocto,
+ sdi.heartDeathJudgeDoctT as heartdeathjudgedoctt,
+ sdi.heartDeathJudgeAnnex as heartdeathjudgeannex
FROM
service_donatebaseinfo sd
LEFT JOIN service_deathinfo sdi ON sd.ID = sdi.InfoID
--
Gitblit v1.9.3