Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

puzhibing

2024-12-06 00ae986ab67e60a09464683e5985794e47aa19e0

 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;