From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
index 4c51ce9..7bc1f4c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesDao.xml
+++ b/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>
\ No newline at end of file

--
Gitblit v1.9.1