Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml

@@ -417,4 +417,26 @@
         a.${record.sort} ${record.order}
      </if>
   </select>

   <select id="selectOneByCompanyIdAndActTypeAndActStatus" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
      *
      FROM
      shop_activities a
      where
         a.company_id=#{companyId}
         and a.act_type=#{activitiesTypeSign}
         and a.act_status=#{actstatusStatusIng}
   </select>

   <select id="selectOneByCompanyIdAndActType" resultType="com.matrix.system.shopXcx.bean.ShopActivities">
      SELECT
         *
      FROM
         shop_activities a
      where
         a.company_id=#{companyId}
        and a.act_type=#{activitiesTypeSign}
        and a.act_status != 5
   </select>
</mapper>