From a0b5291eb64b13555d4390aba7782eb76dced376 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 二月 2025 11:18:55 +0800
Subject: [PATCH] Merge branch 'dev' into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 f4414ee..55cb2a9 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
@@ -19,7 +19,7 @@
@ApiOperation(value = "鑾峰彇鍘熷璁板綍妯℃澘鍒楄〃")
@GetMapping("/selectStandardTemplatePageList")
- public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate) throws Exception {
+ public Result selectStandardTemplatePageList(Page page,StandardTemplate standardTemplate){
return Result.success(standardTemplateService.selectStandardTemplatePageList(page, standardTemplate));
}
@@ -57,7 +57,7 @@
@GetMapping("/getEditTemplatePreparation")
public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
StandardTemplate byId = standardTemplateService.getById(id);
- return Result.success("OK", byId.getThing());
+ return Result.success(byId.getThing());
}
@ApiOperation(value = "澶嶅埗鍘熷璁板綍妯℃澘")
--
Gitblit v1.9.3