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-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index c92b5b4..b0985e2 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -62,7 +62,8 @@
String status = otherClient.getServiceStatus(data.getUserId().intValue()).getData();
switch (status){
case "1":
- return R.fail("未缴纳服务费");
+// return R.fail("未缴纳服务费");
+ break;
case "2":
return R.fail("服务费已过期");
}
@@ -98,7 +99,8 @@
String status = otherClient.getServiceStatus(data.getUserId().intValue()).getData();
switch (status){
case "1":
- return R.fail("未缴纳服务费");
+// return R.fail("未缴纳服务费");
+ break;
case "2":
return R.fail("服务费已过期");
}
--
Gitblit v1.7.1