From a11bc1bed7953b88213330582c2085f60b5a73b1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 六月 2024 15:01:56 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index c7b31f0..03fd6bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -7,6 +7,8 @@
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.admin.response.StagingDataVO;
+import com.doumee.dao.business.dto.RegisterDriverDTO;
+import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRole;
import com.doumee.dao.web.reqeust.AccountLoginDTO;
@@ -160,6 +162,11 @@
void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
+ /**
+ * 鍙告満娉ㄥ唽
+ * @param registerDriverDTO
+ */
+ void registerDriver(RegisterDriverDTO registerDriverDTO);
/**
* 寰俊鎺堟潈鎺ュ彛
@@ -170,7 +177,7 @@
- MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
+ List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
/**
@@ -205,5 +212,8 @@
void batchRoleAuth(Member memberRole);
- String importBatch(MultipartFile file, LoginUserInfo loginUser);
+ String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser);
+
+
+ List<Member> findDriveList(Member model);
}
--
Gitblit v1.9.3