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

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 src/main/java/com/ycl/jxkg/base/BaseApiController.java

@@ -2,7 +2,7 @@


import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.entity.User;
import org.springframework.beans.factory.annotation.Autowired;

/**