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

liyong

5 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

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