From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
index 2764267..b30f76c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java
@@ -608,4 +608,9 @@
public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse) {
return sysProjUseDao.selectTaoCanListWithProj(sysProjUse);
}
+
+ @Override
+ public int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId) {
+ return sysProjUseDao.selectTaocanCountForCourseAndInfinite(taocanId, vipId);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1