Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java

@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,7 +34,7 @@

    @GetMapping("/listPage")
    @Operation(summary = "分页查询")
    public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
    public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
    }

@@ -42,7 +42,7 @@
    @Operation(summary = "添加")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.INSERT)
    public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
    public R<?> add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.add(schemeApplicableStaff);
    }

@@ -50,7 +50,7 @@
    @Operation(summary = "修改")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.UPDATE)
    public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
    public R<?> updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
        return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
    }

@@ -58,7 +58,7 @@
    @Operation(summary = "删除")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "社保方案适用人员表", businessType = BusinessType.DELETE)
    public AjaxResult delete(@RequestBody List<Long> ids) {
    public R<?> delete(@RequestBody List<Long> ids) {
        return schemeApplicableStaffService.delete(ids);
    }