From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..2003e68 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -1,7 +1,8 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,13 +18,13 @@
*/
public interface StaffSalaryMainService extends IService<StaffSalaryMain> {
- AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain);
+ R listPage(Page page, StaffSalaryMain staffSalaryMain);
- AjaxResult add(StaffSalaryMain staffSalaryMain);
+ R<?> add(StaffSalaryMain staffSalaryMain);
- AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
+ R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
- AjaxResult calculateSalary(List<Long> ids);
+ R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
--
Gitblit v1.9.3