~jiangyouyao/beauty-erp.git

			@@ -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}