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-management/src/main/java/com/ruoyi/management/service/ITUserService.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java
index 80af5f3..7ccaa8d 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/service/ITUserService.java
@@ -2,10 +2,6 @@
import com.ruoyi.management.domain.TUser;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.management.dto.AppUserQuery;
-import com.ruoyi.management.vo.AppUserVO;
-
-import java.util.List;
/**
* <p>
@@ -17,6 +13,7 @@
*/
public interface ITUserService extends IService<TUser> {
- List<AppUserVO> listAll(AppUserQuery query);
+// List<AppUserVO> listAll(AppUserQuery query);
+ Boolean phoneCode(String phone) throws Exception;
}
--
Gitblit v1.7.1