From cffe7729a3c9f77ad1423bee2da82505a323ffa1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 六月 2024 14:08:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/service/src/main/java/com/doumee/service/business/MemberService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index 592bffd..d8465aa 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -4,6 +4,7 @@
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.dto.MemberImport;
 import com.doumee.dao.business.dto.MemberQueryDTO;
+import com.doumee.dao.business.dto.MemberReduceImport;
 import com.doumee.dao.business.model.Member;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -67,6 +68,8 @@
      */
     Member findById(Integer id);
 
+    Member findDetailById(Integer id);
+
     /**
      * 鏉′欢鏌ヨ鍗曟潯璁板綍
      *
@@ -104,6 +107,7 @@
 
     List<Member> findListByDTO(MemberQueryDTO memberQueryDTO);
 
-    List<MemberImport> importBatch(MultipartFile file);
+    List<MemberImport> importBatch(MultipartFile file,Integer  solutionId);
+    List<MemberReduceImport> importReduceBatch(MultipartFile file, Integer  applyId);
 
 }

--
Gitblit v1.9.3