~jiangyouyao/beauty-erp.git

jiangyouyao / beauty-erp

forked from beauty-erp

summary
commits
tree
docs
forks
compare

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

wzy

2021-11-20 2a7a159b136805612e241e4e8e24affedfc23cc2

 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>

			@@ -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>