From 29cadb9df9e289fc4dd45d17e577fe9695232ea4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 30 五月 2024 22:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
index 471e07f..eb43450 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -72,15 +72,15 @@
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "鎵瑰噯")
@PostMapping("/approve")
- public Result approve(Integer id, String state) {
- return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(id,state));
+ public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
@ApiOperation(value = "瀹℃牳")
@PostMapping("/check")
public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
- return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
+ return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
}
@ValueClassify("宸ユ椂绠＄悊")
--
Gitblit v1.9.3