Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

2 天以前 5b83294fac4605b569a5a0d1c5e0f310026d10d4

 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);
}