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

xiangpei

2024-06-25 8f20b8b0442e484220352455addc8c2e6945b153

 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;