From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
index 2c00aa4..d0898fe 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ConsumptionRecordMapper.xml
@@ -65,15 +65,12 @@
         SELECT * FROM `consumption_record`
         where record_type=1
         and update_time is null
-        <where>
             <if test="DetailList!=null and DetailList.size()>0">
                 and pro_order_detail_id in
                 <foreach item="item" index="index" collection="DetailList" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
-        </where>
-        and pro_order_detail_id in (1,1)
         order by id desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0