From d5d3d4e6397f23782958748f46c389b85eaafe47 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 20 Aug 2021 14:28:43 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 2a1b757..957d259 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -924,7 +924,7 @@
left join shopping_goods f on e.proj_id=f.id
where 1=1 and a.type='套餐' and a.TAOCAN_ID IS NULL
<if test="record.queryKey != null and record.queryKey !='' ">
- and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
+ and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(b.goods_no, #{record.queryKey}))
</if>
<if test="record.isOver != null and record.isOver !='' ">
and a.IS_OVER = #{record.isOver}
--
Gitblit v1.9.1