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

xiangpei

2024-06-26 44aaa355ecf9430f8b182654d03c2914287bcba6

 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;