From 679b072c926361039c5b9f47cf99f015a1eefd01 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 14:18:54 +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 | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 2e35522..27779ea 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
@@ -4,6 +4,7 @@
import com.xcong.farmer.cms.modules.system.dto.*;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -27,7 +28,6 @@
@ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminColumnVo.class)})
@PostMapping(value = "/columnInPage")
public Result getColumnInPage(@RequestBody @Valid AdminColumnDto adminColumnDto) {
-// log.info("--->{}", SecurityContextHolder.getContext().getAuthentication());
return iColumnService.getColumnInPage(adminColumnDto);
}
@@ -44,13 +44,10 @@
return iColumnService.addColumn(adminAddColumnDto);
}
- @ApiOperation(value = "删除栏目", notes = "删除栏目")
- @GetMapping(value = "/deleteColumn/{id}")
- public Result deleteColumn(@PathVariable(value = "id") Long id) {
- return iColumnService.deleteColumn(id);
- }
-
@ApiOperation(value = "查看栏目", notes = "查看栏目")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = AdminSeeColumnInfoVo.class)
+ })
@GetMapping(value = "/seeColumnInfo/{id}")
public Result seeColumnInfo(@PathVariable(value = "id") Long id) {
return iColumnService.seeColumnInfo(id);
--
Gitblit v1.9.1