From 0846753b50b65e8974b3860e6064c38be9c114a9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:58 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 5 +++--
1 files changed, 3 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 9685325..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);
@@ -302,6 +302,7 @@
userDto.setCityCode(byId.getCityCode());
userDto.setCity(byId.getCity());
userDto.setName(byId.getName());
+ userDto.setDetail(byId.getAddressDetail());
return R.ok(userDto);
}
--
Gitblit v1.7.1