解决冲突

prec-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -1,17 +1,15 @@
 package com.diagbot.client;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.HospitalSetVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @Description: 调用信息对接层服务
@@ -20,11 +18,10 @@ import com.diagbot.vo.HospitalSetVO;
  */
 @FeignClient(value = "tran-service", fallback = TranServiceHystrix.class)
 public interface TranServiceClient {
-	/**
-	 * 
-	 * @param hospitalSetVO
-	 * @return
-	 */
-	@PostMapping("/sysSet/getSysSetInfoDatas")
+    /**
+     * @param hospitalSetVO
+     * @return
+     */
+    @PostMapping("/sysSet/getSysSetInfoDatas")
     RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid @RequestBody HospitalSetVO hospitalSetVO);
 }

prec-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -1,27 +1,15 @@
 package com.diagbot.client.hystrix;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.stereotype.Component;
-
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.vo.HospitalSetVO;
-
 import lombok.extern.slf4j.Slf4j;
-
-<<<<<<< HEAD
-import java.util.List;
+import org.springframework.stereotype.Component;
 
 import javax.validation.Valid;
+import java.util.List;
 
-import org.springframework.stereotype.Component;
-
-=======
->>>>>>> dev/KLBstand
 /**
  * @Description: 调用信息对接层服务
  * @author: gaodm
@@ -30,9 +18,9 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class TranServiceHystrix implements TranServiceClient {
-	@Override
-	public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
-		log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
-		return null;
-	}
+    @Override
+    public RespDTO<List<SysSetInfoDTO>> getSysSetInfoDatas(@Valid HospitalSetVO hospitalSetVO) {
+        log.error("【hystrix】调用{}异常", "getSysSetInfoDatas");
+        return null;
+    }
 }