merge code , fix red error

src/main/java/com/cnooc/expert/config/TheWebMvcConfigurer.java

@@ -11,31 +11,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class TheWebMvcConfigurer implements WebMvcConfigurer {
 
-//    @Autowired
-//    private LoginInterceptor loginInterceptor;
-//
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//
-//        // 注册登录拦截器，并设置拦截路径和排除路径
-//        registry.addInterceptor(loginInterceptor)
-//                .addPathPatterns("/**") // 拦截所有路径
-//                .excludePathPatterns( // 排除一些路径
-//                        "/sys/**",
-//                        "/verify/**",
-//                        "/person/**",
-//                        "/text/**"
-//                );
-//
-//        registry.addInterceptor(webAuthInterceptor());
-//    }
-
-<<<<<<< HEAD
-//    @Bean-
-//    public WebAuthInterceptor webAuthInterceptor() {
-//        return new WebAuthInterceptor();
-//    }
-=======
+    @Autowired
+    private LoginInterceptor loginInterceptor;
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
 
@@ -58,6 +36,5 @@ public class TheWebMvcConfigurer implements WebMvcConfigurer {
     public WebAuthInterceptor webAuthInterceptor() {
         return new WebAuthInterceptor();
     }
->>>>>>> 693c0e523aee3f3c218470be2387b4420ce73972
 
 }

src/main/java/com/cnooc/expert/external/expert/api/LoginServiceApi.java

 package com.cnooc.expert.external.expert.api;
 
-<<<<<<< HEAD
-import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
-import com.cnooc.expert.external.expert.model.response.ExpertInfoGetTestResp;
-=======
 import com.cnooc.expert.external.expert.model.request.ExpertInfoAppReq;
+import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoReq;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoAppResp;
+import com.cnooc.expert.external.expert.model.response.ExpertInfoGetTestResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoResp;
->>>>>>> 693c0e523aee3f3c218470be2387b4420ce73972
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.HeaderMap;
@@ -17,10 +14,10 @@ import retrofit2.http.POST;
 import java.util.Map;
 
 public interface LoginServiceApi {
-<<<<<<< HEAD
+
     @POST("/")
     Call<ExpertInfoGetTestResp> expertDetailUpDate(@HeaderMap Map<String, Object> headers, @Body ExpertInfoGetReq user);
-=======
+
     @POST("/zjfw/zggrxxgl/querySingleByShengFenZhengOrMobile")
     Call<ExpertInfoResp> querySingleByShengFenZhengOrMobile(@HeaderMap Map<String, Object> headers, @Body ExpertInfoReq expertInfoReq);
 
@@ -32,5 +29,5 @@ public interface LoginServiceApi {
 
     @POST("/zjfw/zggrxxgl/updateZhuanJiaInfoApp")
     Call<ExpertInfoAppResp> updateZhuanJiaInfoApp(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
->>>>>>> 693c0e523aee3f3c218470be2387b4420ce73972
+
 }