Merge branch 'master' of http://42.193.1.25:9521/r/jxkg-new

zhanghua

2024-10-28 b129977dbaff2501459009577667ab11ed0163ab

 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;

/**