From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
index 62d6251..22f0fa6 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjReservationMapper.xml
@@ -85,7 +85,7 @@
<if test="phoe != null and phoe != ''">and phoe = #{phoe}</if>
<if test="company != null and company != ''">and company like concat('%', #{company}, '%')</if>
<if test="companyId != null and companyId != ''">and company_id = #{companyId} </if>
- <if test="reservationTime != null ">and reservation_time BETWEEN #{reservationTime} and now()</if>
+ <if test="yykssj != null and yyjssj != null ">and reservation_time BETWEEN #{yykssj} and #{yyjssj} </if>
<if test="isExpire != null ">and is_expire = #{isExpire}</if>
and deleted = '0'
</where>
--
Gitblit v1.8.0