From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
index 005c72c..abecabd 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
@@ -1,8 +1,16 @@
package com.ruoyi.other.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.other.api.domain.PointSetting;
+import com.ruoyi.other.service.PointSettingService;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -14,7 +22,16 @@
*/
@RestController
@RequestMapping("/point-setting")
-public class PointSettingController {
+public class PointSettingController extends BaseController {
+
+ @Resource
+ private PointSettingService pointSettingService;
+
+ @GetMapping("/getBaseSetting")
+ public R<PointSetting> getBaseSetting(@RequestParam Integer id) {
+ PointSetting pointSetting = pointSettingService.getById(id);
+ return R.ok(pointSetting);
+ }
}
--
Gitblit v1.7.1