Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -5,6 +5,7 @@

import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;