Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

9 天以前 893fda1fa8bc17002a866381e8940e1c31d11d93

 src/main/java/com/ruoyi/project/system/mapper/SysUserDeptMapper.java

@@ -7,9 +7,12 @@
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

@Mapper
public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {

    List<SysUserDeptVo> selectUserDeptList(@Param("userDeptVo") SysUserDeptVo userDeptVo);
    List<SysUserDeptVo> userLoginFacotryList(@Param("userDeptVo") SysUserDeptVo userDeptVo);

    List<Map<String, Object>> setSchemeApplicableStaffUserInfo(@Param("ids") List<Long> ids);
}