From a58e10712eff439bd06fedd1613168ab72db00da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 四月 2025 16:20:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 03fd6bc..d425932 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
@@ -1,17 +1,14 @@
package com.doumee.service.business;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
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;
import com.doumee.dao.web.reqeust.CheckVisitedDTO;
import com.doumee.dao.web.reqeust.VisitMemberDTO;
import com.doumee.dao.web.response.MemberVO;
@@ -173,20 +170,13 @@
* @param code
* @return
*/
- WxAuthorizeVO wxAuthorize(String code);
+ WxAuthorizeVO wxAuthorize(String code,Integer source);
List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
- /**
- * 璐﹀彿瀵嗙爜
- * 鍐呴儴浜哄憳/鍔冲姟璁垮鐧诲綍
- * @param accountLoginDTO
- * @return
- */
- WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);
/**
* 鍐呴儴鍙嫓璁夸汉鍛樺垎椤�
@@ -216,4 +206,6 @@
List<Member> findDriveList(Member model);
+
+ void initPinyinTool();
}
--
Gitblit v1.9.3