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/ServiceDonationwitnessMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
index 0c66ac5..de7c323 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -158,7 +158,9 @@
         st.OrganDonation_Other as organdonationOther,
         st.DonationCategory as donationcategory,
         st.DeathJudgeAnnex as deathjudgeannex,
-        st.witness_state as witnessState
+        st.witness_state as witnessState,
+        st.IsSpendRemember as isspendremember,
+        st.IsRestoreRemains as isrestoreremains
         FROM
         service_donatebaseinfo sd
         LEFT JOIN service_donationwitness st ON sd.ID = st.InfoID

--
Gitblit v1.9.3