From 43113d6b1670530dfb4348836fd491c79f36af0a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 三月 2026 10:31:20 +0800
Subject: [PATCH] Merge branch 'dev_New' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
index bb90d61..1794e43 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -25,5 +26,5 @@
AjaxResult delete(List<Long> ids);
- AjaxResult calculateSalary(List<Long> ids);
+ AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
--
Gitblit v1.9.3