From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
index 7c421b5..6bafe6f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -380,6 +380,7 @@
 		c.NAME as gs_NAME,
 		c.UNIT as gs_UNIT,
 		c.good_type as gs_good_type,
+		c.measure as gs_measure,
 		c.GOODS_SORT_ID as gs_GOODS_SORT_ID,
 		c.SUPPLIER_ID as gs_SUPPLIER_ID,
 		(select TYPE_NAME from sys_goods_type t where t.id=c.GOODS_SORT_ID) gs_goodsSortName,

--
Gitblit v1.9.1