From 49c5117caef44d1e817d2ef701529dfaf1443467 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 六月 2025 16:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 01fa855..17efee6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -12,6 +12,7 @@
 import com.ruoyi.system.api.domain.dto.MgtPageDto;
 import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
 import com.ruoyi.system.domain.dto.*;
+import com.ruoyi.system.domain.pojo.config.BottomNav;
 import com.ruoyi.system.domain.vo.*;
 import com.ruoyi.system.service.config.*;
 import io.swagger.annotations.Api;
@@ -77,6 +78,9 @@
 
     @Resource
     private RecommendCooperationService recommendCooperationService;
+
+    @Resource
+    private BottomNavService bottomNavService;
 
 
     @RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
@@ -235,6 +239,18 @@
         return R.ok();
     }
 
+    @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+    @ApiOperation(value = "获取底部导航栏配置数据")
+    public R<List<BottomNav>> getBottomNav() {
+        List<BottomNav> list = bottomNavService.getAllBottomNav();
+        return R.ok(list);
+    }
+    @RequestMapping(value = "/editBottomNav", method = RequestMethod.PUT)
+    @ApiOperation(value = "获取底部导航栏配置数据")
+    public R<Void> editBottomNav(@RequestBody BottomNavDto bottomNavDto) {
+        return bottomNavService.editBottomNav(bottomNavDto);
+    }
+
     @RequestMapping(value = "/pageQuickEntry", method = RequestMethod.POST)
     @ApiOperation(value = "分页获取快速入口")
     public R<Page<MgtQuickEntryPageVo>> pageQuickEntry(@RequestBody MgtPageDto mgtPageDto) {

--
Gitblit v1.7.1