Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into alpha

姜友瑶

2022-06-09 824691c5f2e538fd83e75701f0c436ff5f4d8d2b

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

@@ -428,4 +428,15 @@
         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>