From 20ab36d718cf7cae6e2b24b411bc365b4fa79e6e Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 21 五月 2024 17:13:22 +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 | 6 +++++- 1 files changed, 5 insertions(+), 1 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..2fabbd8 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,7 @@ 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.ResetPasswordDTO; import com.doumee.dao.business.model.Member; import com.doumee.dao.business.model.MemberRole; import com.doumee.dao.web.reqeust.AccountLoginDTO; @@ -205,5 +206,8 @@ void batchRoleAuth(Member memberRole); - String importBatch(MultipartFile file, LoginUserInfo loginUser); + String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser); + + + } -- Gitblit v1.9.3