Merge branch 'ty_urgent' into test

Helius

2020-12-19 a9bb3348487c4a75c6a74a4d84f3a8afe9858d0c

 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,