From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
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 2003e68..1794e43 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.R;
+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;
@@ -18,13 +18,13 @@
*/
public interface StaffSalaryMainService extends IService<StaffSalaryMain> {
- R listPage(Page page, StaffSalaryMain staffSalaryMain);
+ AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain);
- R<?> add(StaffSalaryMain staffSalaryMain);
+ AjaxResult add(StaffSalaryMain staffSalaryMain);
- R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
+ AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
- R<?> delete(List<Long> ids);
+ AjaxResult delete(List<Long> ids);
- R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
+ AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
--
Gitblit v1.9.3