From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试

---
 java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml
index 551d310..ab463ad 100755
--- a/java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/CarInoutServiceDaoImplMapper.xml
@@ -246,6 +246,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="merchantId !=null and merchantId != ''">
+            and t.merchant_id= #{merchantId}
+        </if>
         <if test="states !=null">
             and t.state in
             <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">

--
Gitblit v1.8.0