mergin login

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

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

src/main/java/com/cnooc/expert/controller/expert/ExpertController.java

@@ -94,7 +94,7 @@ public class ExpertController {
     }
 
     /**
-     * 学位列表
+     * 评标专业
      *
      * @return
      */

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;
-=======
->>>>>>> 3bc7fe8847766d39bf419c764c9495af3590dfa2
 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;
@@ -34,8 +29,5 @@ public interface LoginServiceApi {
 
     @POST("/zjfw/zggrxxgl/updateZhuanJiaInfoApp")
     Call<ExpertInfoAppResp> updateZhuanJiaInfoApp(@HeaderMap Map<String, Object> headers, @Body ExpertInfoAppReq expertInfoAppReq);
-<<<<<<< HEAD
-=======
 
->>>>>>> 3bc7fe8847766d39bf419c764c9495af3590dfa2
 }