From 1ba00bbbd771572c06f774f48ec748434407d399 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 七月 2025 11:06:11 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
index 4f0776f..06d5f08 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -206,8 +206,8 @@
             <if test="infoname != null ">and infoName = #{infoname}</if>
             <if test="infophone != null ">and infoPhone = #{infophone}</if>
             <if test="createBy != null ">and `service_donatebaseinfo`.create_by = #{createBy}</if>
-            <if test="starttime != null ">and ReportTime >= #{starttime}</if>
-            <if test="endtime != null ">and ReportTime &lt;= #{endtime}</if>
+            <if test="starttime != null ">and donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and donatetime &lt;= #{endtime}</if>
             <if test="nativeplace != null  and nativeplace != ''">and NativePlace = #{nativeplace}</if>
             <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
             <if test="deptid != null ">and deptid = #{deptid}</if>
@@ -389,4 +389,4 @@
           AND d.OrganGetTime &lt;= #{endtime}
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3