From 9687fd99fdf6208dbf747ea45c440f192a9af815 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 14 三月 2025 17:43:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev
---
cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
index e507069..2103526 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
@@ -33,14 +33,13 @@
/**
* 瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ
- * @param data
+ * @param page
+ * @param internalWastes
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalWastes")
- public Result<IPage<InternalWastesDto>> pageInternalWastes(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalWastes internalWastes = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalWastes.class);
+ @GetMapping("/pageInternalWastes")
+ public Result<IPage<InternalWastesDto>> pageInternalWastes(Page page,InternalWastes internalWastes) throws Exception {
return Result.success(internalWastesService.pageInternalWastes(page, internalWastes));
}
@@ -69,7 +68,7 @@
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒犻櫎")
- @GetMapping("/delInternalWastes")
+ @DeleteMapping("/delInternalWastes")
public Result delInternalWastes(Integer wastesId){
return Result.success(internalWastesService.delInternalWastes(wastesId));
}
--
Gitblit v1.9.3