Merge remote-tracking branch 'origin/master'

xiangpei

2024-06-19 5ff3d0d90f6f46f9d48c6852884edb16ecc78ad3

 src/main/java/com/ycl/jxkg/context/WebContext.java

@@ -1,6 +1,6 @@
package com.ycl.jxkg.context;

import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;