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/miniapp/AppHomeController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
index 95b3b2e..917248d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java
@@ -1,14 +1,8 @@
package com.ruoyi.system.controller.miniapp;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.domain.vo.AppAdvertVo;
-import com.ruoyi.system.domain.vo.AppBannerVo;
-import com.ruoyi.system.domain.vo.AppPopVo;
-import com.ruoyi.system.domain.vo.AppQuickEntryVo;
-import com.ruoyi.system.service.config.AdvertService;
-import com.ruoyi.system.service.config.BannerService;
-import com.ruoyi.system.service.config.PopService;
-import com.ruoyi.system.service.config.QuickEntryService;
+import com.ruoyi.system.domain.vo.*;
+import com.ruoyi.system.service.config.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,6 +38,9 @@
@Resource
private PopService popService;
+ @Resource
+ private BottomNavService bottomNavService;
+
@@ -77,4 +74,11 @@
+ @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+ @ApiOperation(value = "获取底部导航栏")
+ public R<List<AppBottomNavVO>> getBottomNav() {
+ List<AppBottomNavVO> list = bottomNavService.getAppBottomNav();
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1