From 9434605b2a844d3efa511415b15a43c44f21755b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Apr 2021 19:41:28 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
index 4fe3c21..d9d505a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
@@ -348,7 +348,6 @@
 		from money_card_use_flow
 		<where>
 				and car_use_id=#{record.carUseId}
-
 			<if test="record.queryTime!=null and record.queryTime!=''">
 				and DATE_FORMAT(create_time,'%Y-%m')=#{record.queryTime}
 			</if>

--
Gitblit v1.9.1