From 146edfb05602373ad5b36771e1ede1e395d8ab62 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 27 二月 2025 14:53:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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..50b1b89 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));
}
@@ -56,8 +56,7 @@
@ApiOperation(value = "缂栬緫妯℃澘缂栧埗")
@GetMapping("/getEditTemplatePreparation")
public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) {
- StandardTemplate byId = standardTemplateService.getById(id);
- return Result.success("OK", byId.getThing());
+ return Result.success(standardTemplateService.getStandTempThingById(id));
}
@ApiOperation(value = "澶嶅埗鍘熷璁板綍妯℃澘")
--
Gitblit v1.9.3