From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursController.java
index bab8fc7..3d0f996 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursController.java
@@ -8,10 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
@@ -33,15 +30,17 @@
private AuxiliaryWorkingHoursService auxiliaryWorkingHoursService;
@ApiOperation(value="鏌ヨ杈呭姪宸ユ椂")
- @PostMapping("/selectAuxiliaryWorkingHours")
+ @GetMapping("/selectAuxiliaryWorkingHours")
public Result selectAuxiliaryWorkingHours(Page page,AuxiliaryWorkingHours entity) throws Exception {
return Result.success(auxiliaryWorkingHoursService.selectAuxiliaryWorkingHours(page,entity));
}
@ApiOperation(value="鍒犻櫎杈呭姪宸ユ椂")
- @PostMapping("/deleteAuxiliaryWorkingHours")
+ @DeleteMapping("/deleteAuxiliaryWorkingHours")
public Result deleteAuxiliaryWorkingHours(Integer id){
+
return Result.success(auxiliaryWorkingHoursService.deleteAuxiliaryWorkingHours(id));
+
}
@ApiOperation(value="淇敼杈呭姪宸ユ椂")
--
Gitblit v1.9.3