From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/member/service/IMemberService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/member/service/IMemberService.java b/src/main/java/org/springblade/modules/member/service/IMemberService.java
index 382ee31..689bdb7 100644
--- a/src/main/java/org/springblade/modules/member/service/IMemberService.java
+++ b/src/main/java/org/springblade/modules/member/service/IMemberService.java
@@ -16,10 +16,14 @@
  */
 package org.springblade.modules.member.service;
 
-import org.springblade.modules.member.entity.Member;
-import org.springblade.modules.member.vo.MemberVO;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.member.entity.Member;
+import org.springblade.modules.member.excel.memberExcel;
+import org.springblade.modules.member.vo.MemberVO;
+import org.springblade.modules.shareholder.excel.shareExcel;
+
+import java.util.List;
 
 /**
  *  服务类
@@ -37,5 +41,6 @@
 	 * @return
 	 */
 	IPage<MemberVO> selectMemberPage(IPage<MemberVO> page, MemberVO member);
-
+	IPage<MemberVO> selectMemberInfo(IPage<MemberVO> page,Member member);
+	void importmember(List<memberExcel> data, Boolean isCovered);
 }

--
Gitblit v1.9.3