From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
index 1494421..5373775 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
@@ -163,10 +163,10 @@
@ApiOperation(value = "用户注册协议/用户隐私协议", tags = {"用户端-登录"})
@GetMapping(value = "/registerOrAgreement")
@ApiImplicitParams({
- @ApiImplicitParam(value = "0:用户注册协议、1:用户隐私协议", name = "type", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "0:用户注册协议、1:用户隐私协议；3：服务规则管理", name = "type", dataType = "Integer", required = true)
})
public R<Agreement> registerOrAgreement(@RequestParam Integer type) {
- if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type)) {
+ if (!Constants.ZERO.equals(type) && !Constants.ONE.equals(type) && !Constants.THREE.equals(type)) {
throw new GlobalException("获取类型异常！");
}
R<Agreement> r = adminClient.agreementPolicy(type);
--
Gitblit v1.7.1