From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
index c14f1a3..b9e90e3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
@@ -1,9 +1,9 @@
package com.ruoyi.basic.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.Result;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.common.core.domain.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -18,8 +18,8 @@
private StandardTemplateService standardTemplateService;
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
- @PostMapping("/selectStandardTemplatePageList")
- public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
+ @GetMapping("/selectStandardTemplatePageList")
+ public Result selectStandardTemplatePageList(Page page, StandardTemplate standardTemplate) throws Exception {
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
@@ -36,7 +36,7 @@
}
@ApiOperation(value = "鍒犻櫎鍘熷璁板綍妯℃澘")
- @PostMapping("/delStandardTemplate")
+ @DeleteMapping("/delStandardTemplate")
public Result<?> delStandardTemplate(Integer id) {
return Result.success(standardTemplateService.delStandardTemplate(id));
}
@@ -48,7 +48,7 @@
}
@ApiOperation(value = "閫氳繃妯℃澘id鑾峰彇妫�楠岄」妯℃澘鍐呭")
- @PostMapping("/getStandTempThingById")
+ @GetMapping("/getStandTempThingById")
public Result<?> getStandTempThingById(Integer id) {
return Result.success(standardTemplateService.getStandTempThingById(id));
}
@@ -58,11 +58,5 @@
public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
StandardTemplate byId = standardTemplateService.getById(id);
return Result.success("OK", byId.getThing());
- }
-
- @ApiOperation(value = "澶嶅埗鍘熷璁板綍妯℃澘")
- @PostMapping("/copyStandardTemplate")
- public Result copyStandardTemplate(@RequestBody StandardTemplate newTemplate) {
- return Result.success(standardTemplateService.copyStandardTemplate(newTemplate));
}
}
--
Gitblit v1.9.3