Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 3ed7fcd25a5233a8fc1a00e5602e89e92ebe82ae

 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;