Merge branch 'ty_urgent' into test

wzy

2020-12-26 b026000678b45d14970bca3b8052e377072f4af2

 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,
@@ -811,6 +813,9 @@
         <if test=" record.endTime!=null  ">
            <![CDATA[    and #{record.endTime} >=b.create_time]]>
         </if>
         <if test="record.companyId != null and record.companyId !='' ">
            and   b.company_id = #{record.companyId}
         </if>
      </where>
      UNION ALL
      SELECT
@@ -846,6 +851,9 @@
         <if test=" record.endTime!=null   ">
            <![CDATA[    and #{record.endTime} >= t2_b.create_time  ]]>
         </if>
         <if test="record.companyId != null and record.companyId !='' ">
            and   t2_b.company_id = #{record.companyId}
         </if>
      </where>
      ) t