Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/SysUserRoleFallbackFactory.java

@@ -1,11 +1,8 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.feignClient.SysUserRoleClient;
import com.ruoyi.system.api.model.*;
import com.ruoyi.system.api.model.SysUserRoleVo;
import org.springframework.stereotype.Component;

import java.util.List;