From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
index 1ec531d..cff1847 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITUserService.java
@@ -7,7 +7,6 @@
 import com.ruoyi.study.vo.AppUserVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -27,7 +26,7 @@
      * @param phone 手机号信息
      * @return 验证码发送结果
      */
-    Boolean phoneCode(String phone);
+    Boolean phoneCode(String phone) throws Exception;
 
     /**
      * 判断当前登录用户是否为vip
@@ -36,11 +35,4 @@
      */
     Boolean isVip();
 
-    /**
-     * 微信分享app
-     *
-     * @param url app网页链接
-     * @return 返回信息
-     */
-    Map<String, Object> weiXinShare(String url);
 }

--
Gitblit v1.7.1