From f2d0713c2b20a6c751399e2468996eafb8812988 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Thu, 18 Apr 2024 10:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResStagCapDiscService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResStagCapDiscService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResStagCapDiscService.java
index 6279569..65510c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResStagCapDiscService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResStagCapDiscService.java
@@ -3,7 +3,10 @@
 import cn.gistack.sm.sjztmd.entity.TbAttResRsbVerspi;
 import cn.gistack.sm.sjztmd.entity.TbRelResUser;
 import cn.gistack.sm.sjztmd.entity.TbResStagCapDisc;
+import cn.gistack.sm.sjztmd.excel.TbRelResUserExcel;
+import cn.gistack.sm.sjztmd.excel.TbResStagCapDiscImportExcel;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -15,4 +18,8 @@
     Boolean auditByGuid(List<TbResStagCapDisc> list);
 
 	List<TbResStagCapDisc> getDetailByResGuid(String ResGuid);
+
+    void importTbResStagCapDisc(List<TbResStagCapDiscImportExcel> data,String resGuid);
+
+	List<TbResStagCapDisc> readExcel(MultipartFile file);
 }

--
Gitblit v1.9.3