From 1facfdc9361d888d72c959bac4d8fb05dcad02d7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 07 Jul 2022 18:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
index 236057e..fec1746 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/controller/AdminColumnController.java
@@ -5,6 +5,7 @@
import com.xcong.farmer.cms.modules.system.service.IColumnService;
import com.xcong.farmer.cms.modules.system.vo.AdminColumnVo;
import com.xcong.farmer.cms.modules.system.vo.AdminSeeColumnInfoVo;
+import com.xcong.farmer.cms.modules.system.vo.WebColumnVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
@RestController
@@ -72,4 +74,11 @@
return Result.ok("发布成功");
}
+ @ApiOperation(value = "网页栏目列表", notes = "网页栏目列表")
+ @ApiResponses({@ApiResponse(code = 200, message = "ok", response = WebColumnVo.class)})
+ @GetMapping(value = "/webColumnInList")
+ public Result webColumnInList(HttpServletRequest request) {
+ return iColumnService.getWebColumnInList(request);
+ }
+
}
--
Gitblit v1.9.1