From 1bea61102b935d0d5acd3a5ce8f441452a86ff4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
index c4caf3e..67b808d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/AgreementController.java
@@ -1,9 +1,18 @@
package com.ruoyi.system.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.domain.Agreement;
+import com.ruoyi.system.service.IAgreementService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -16,5 +25,12 @@
@RestController
@RequestMapping("/agreement")
public class AgreementController {
-
+ @Resource
+ private IAgreementService iAgreementService;
+ @RequestMapping("/getAgreement")
+ @ResponseBody
+ @ApiOperation(value = "获取用户协议/隐私协议")
+ public R<Agreement> getAgreement(@PathVariable("agreementType") Integer agreementType) {
+ return R.ok(iAgreementService.getAgreement(agreementType));
+ }
}
--
Gitblit v1.7.1