分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.personnel.dto.PersonJobResponsibilitiesDto;
import com.ruoyi.personnel.pojo.PersonJobResponsibilities;
import org.apache.ibatis.annotations.Param;

import javax.servlet.http.HttpServletResponse;

@@ -19,9 +20,9 @@
public interface PersonJobResponsibilitiesService extends IService<PersonJobResponsibilities> {

    IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page,
                                                                        String userId,
                                                                        String departmentId,
                                                                        String userName);
                                                                        @Param("userId") Integer userId,
                                                                        @Param("departmentId") String departmentId,
                                                                        @Param("userName") String userName);

    void exportPersonJobResponsibilities(Integer id, HttpServletResponse response);
}