From 32063e565deaf03a0cc8abf1fafd146cc4e4d421 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 24 二月 2026 17:41:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
index a0573eb..8c995c5 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpAgreementController.java
@@ -2,24 +2,19 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.controller.BaseController;
-import com.xiaopeng.common.core.web.domain.AjaxResult;
import com.xiaopeng.operation.service.XpAgreementService;
import com.xiaopeng.operation.vo.XpAgreementVo;
-import com.xiaopeng.operation.vo.XpBannerListVo;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Slf4j
@RestController
-@RequestMapping("/base/v1/mini-program")
-@Api(tags = "协议模块")
public class XpAgreementController extends BaseController {
private final XpAgreementService xpAgreementService;
@@ -29,21 +24,23 @@
}
@ApiOperation(value = "获取协议",tags = {"小程序-首页"},response = XpAgreementVo.class)
- @GetMapping("/privacy/content/{type}")
+ @GetMapping("/base/v1/mini-program/privacy/content/{type}")
public R<XpAgreementVo> getContent(@PathVariable Integer type) {
return R.ok(xpAgreementService.getContentByType(type));
}
@ApiOperation(value = "获取协议所有",tags = {"小程序-首页所有"},response = XpAgreementVo.class)
- @GetMapping("/privacy/contentAll")
+ @GetMapping("/base/v1/mini-program/privacy/contentAll")
public R<List<XpAgreementVo>> contentAll() {
return R.ok(xpAgreementService.getContentByTypeAll());
}
-
-
-
+ @ApiOperation(value = "获取协议/隐私政策",tags = {"运维APP-个人中心"},response = XpAgreementVo.class)
+ @GetMapping("/base/v1/privacy/content/{type}")
+ public R<XpAgreementVo> getAppContent(@ApiParam(name = "type", value = "类型 1=用户服务协议 2=平台隐私政策 ") @PathVariable Integer type) {
+ return R.ok(xpAgreementService.getContentByType(type));
+ }
}
--
Gitblit v1.7.1