From a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 19 Dec 2020 15:53:24 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into test

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml |    2 ++
 1 files changed, 2 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 1af5845..df354d5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -657,6 +657,7 @@
 FROM
 	(
 	SELECT
+		b.id id,
 		b.create_time as createTime,
 		e.CODE,
 		e.NAME,
@@ -708,6 +709,7 @@
 
 	UNION ALL
 	SELECT
+		t2_b.id id,
 		t2_b.create_time,
 		t2_e.CODE,
 		t2_e.NAME,

--
Gitblit v1.9.1