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

fuliqi

2024-07-04 c3432d4eef8e6545708e30004189ca3f27b8a067

 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;