From 960380f89c9371ba309d6c50b1ab1b677ea74575 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 26 八月 2025 20:51:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
index 491cf30..45f3bba 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/AppUserService.java
@@ -50,7 +50,7 @@
 	/**
 	 * 注册账号
 	 */
-//	R<LoginVo> registerAccount(RegisterAccount registerAccount);
+	R<LoginVo> registerAccount(RegisterAccount registerAccount);
 
 
 
@@ -66,4 +66,6 @@
 
 
     AppUser index();
+
+    PageInfo<UserPointStatisticsVO> getUserPointPageList(String name, Integer pageCurr, Integer pageSize);
 }

--
Gitblit v1.7.1