From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 12 ++++++------
1 files changed, 6 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 1794e43..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,7 @@
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;
@@ -18,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(CalculateSalaryDto calculateSalaryDto);
+ R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
--
Gitblit v1.9.3