From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
index d4a419b..913bfc7 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java
@@ -59,4 +59,6 @@
public ShopActivities selectOneByCompanyIdAndActTypeAndActStatus(@Param("companyId")Long companyId, @Param("activitiesTypeSign")int activitiesTypeSign,
@Param("actstatusStatusIng")int actstatusStatusIng);
+
+ List<ShopActivities> selectOneByCompanyIdAndActType(@Param("companyId")Long companyId,@Param("activitiesTypeSign") int activitiesTypeSign);
}
\ No newline at end of file
--
Gitblit v1.9.1