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

fuliqi

2024-07-01 5c93dae79d982e3706fb3c8bfbe0a6c831554ddd

 src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.config.spring.security;

import com.ycl.jxkg.domain.enums.RoleEnum;
import com.ycl.jxkg.enums.RoleEnum;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.GrantedAuthority;