From 0fbedcf87c7a7b0503307597425308a42c14f67a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 10 三月 2026 10:40:08 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index 51e8002..ad43b6c 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
import io.swagger.annotations.Api;
@@ -39,8 +40,8 @@
@ApiOperation("閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public AjaxResult calculateSalary(@RequestBody List<Long> ids) {
- return staffSalaryMainService.calculateSalary(ids);
+ public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@PostMapping("/add")
--
Gitblit v1.9.3