Merge branch 'jtwy' into dev_New

zss

昨天 fc830b7f62af651acedb8c11f1e2634fe2a3e497

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