From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交

---
 xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java
index 110f63a..4544365 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/service/AppUserService.java
@@ -1,18 +1,15 @@
 package com.xinquan.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xinquan.common.core.domain.R;
 import com.xinquan.system.api.model.AppCaptchaBody;
 import com.xinquan.system.api.model.AppLoginUser;
 import com.xinquan.system.api.model.AppVerifyCellPhoneBody;
 import com.xinquan.system.api.model.AppWXLoginBody;
-import com.xinquan.user.api.domain.AppUser;
+import com.xinquan.system.api.domain.AppUser;
 import com.xinquan.user.api.domain.dto.AppUserDTO;
 import com.xinquan.user.domain.dto.UserAnswerDTO;
-import com.xinquan.user.domain.vo.AppUserVO;
+import com.xinquan.system.api.domain.vo.AppUserVO;
 import com.xinquan.user.domain.vo.TagVO;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 import java.util.Optional;
@@ -36,6 +33,7 @@
      * @return
      */
     Optional<AppUser> getUserByCondition(AppUserDTO dto);
+    Optional<AppUser> getUserByCondition1(AppUserDTO dto);
 
     /**
      * app用户注册
@@ -59,7 +57,7 @@
      * @param source
      * @return
      */
-    AppLoginUser appleLogin(String appleId);
+    AppLoginUser appleLogin(String appleId,String device);
 
     /**
      * 验证码登录
@@ -102,7 +100,7 @@
      * 获取当前登录用户信息
      *
      * @return 用户信息
-     * @see com.xinquan.user.domain.vo.AppUserVO
+     * @see AppUserVO
      */
     AppUserVO getCurrentUser();
 }

--
Gitblit v1.7.1