From abb4d47e4e1539e43c0683789ce7bdc03f2a9427 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 16:54:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
index f3dc788..9780552 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DynamicColumnController.java
@@ -40,8 +40,8 @@
@PutMapping
@ApiOperation(value = "淇敼", notes = "淇敼")
@PreAuthorize("@ss.hasPermi('dynamicColumn:edit')")
- public Result update(@RequestBody @Validated(Update.class) DynamicColumnForm form) {
- return dynamicColumnService.update(form);
+ public Result update(@RequestBody @NotEmpty(message = "鏁版嵁涓虹┖锛屾棤娉曚繚瀛�") List<DynamicColumnForm> columnList) {
+ return dynamicColumnService.update(columnList);
}
@DeleteMapping("/{id}")
@@ -49,27 +49,6 @@
@PreAuthorize("@ss.hasPermi('dynamicColumn:del')")
public Result removeById(@PathVariable("id") String id) {
return dynamicColumnService.removeById(id);
- }
-
- @DeleteMapping("/batch")
- @ApiOperation(value = "鎵归噺鍒犻櫎", notes = "鎵归噺鍒犻櫎")
- @PreAuthorize("@ss.hasPermi('dynamicColumn:del:batch')")
- public Result remove(@RequestBody @NotEmpty(message = "璇烽�夋嫨鏁版嵁") List<String> ids) {
- return dynamicColumnService.remove(ids);
- }
-
- @GetMapping("/page")
- @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("@ss.hasPermi('dynamicColumn:page')")
- public Result page(DynamicColumnQuery query) {
- return dynamicColumnService.page(query);
- }
-
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("@ss.hasPermi('dynamicColumn:detail')")
- public Result detail(@PathVariable("id") Integer id) {
- return dynamicColumnService.detail(id);
}
@GetMapping("/list")
--
Gitblit v1.8.0