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

maven

3 天以前 5b83294fac4605b569a5a0d1c5e0f310026d10d4

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