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

zss

昨天 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

@@ -11,5 +11,5 @@
@Mapper
public interface SysUserDeptMapper extends BaseMapper<SysUserDept> {

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