Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-16 949e7e46086e034d747746d2b450d7c262c9a594

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

@@ -417,4 +417,15 @@
         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>
</mapper>