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/SysProjUseService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
index 0bf893a..ed21be0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java
@@ -143,4 +143,6 @@
 	public List<SysProjUse> selectTaocanProjUse(Long id, String status);
 
 	public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse);
+
+	int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId);
 }
\ No newline at end of file

--
Gitblit v1.9.1