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

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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