From 844e37605b65a2a3d95b466d663d91ac8584350c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 21:28:17 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
index c06863f..30bfbb7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml
@@ -1236,7 +1236,8 @@
seal_pice price,
is_present isPresent,
unit unit,
- measure measure
+ measure measure,
+ a.good_type goodsType
from shopping_goods a
where 1=1
<if test="record.queryKey != null and record.queryKey != ''">
@@ -1257,7 +1258,7 @@
<select id="selectShopppingGoodsAipTotal" resultType="java.lang.Integer">
select count(1)
- from shopping_goods
+ from shopping_goods a
where 1=1
<if test="record.queryKey != null and record.queryKey != ''">
and (instr(name,#{record.queryKey}) or instr(code ,#{record.queryKey}) or instr(zjm ,#{record.queryKey}))
--
Gitblit v1.9.1