From 254c2a69441dbd9ee9bcb1d134a05eb9da407d17 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 10 七月 2024 14:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java b/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
index 38e01ee..005a33c 100644
--- a/src/main/java/com/ycl/jxkg/config/spring/security/RestDetailsServiceImpl.java
+++ b/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;
@@ -38,7 +38,7 @@
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
 
-        com.ycl.jxkg.domain.User user = userService.getUserByUserName(username);
+        com.ycl.jxkg.domain.entity.User user = userService.getUserByUserName(username);
 
         if (user == null) {
             throw new UsernameNotFoundException("Username  not found.");

--
Gitblit v1.8.0