处理冲突

src/main/java/com/uas/ps/product/service/ProductService.java

@@ -264,13 +264,6 @@ public interface ProductService {
      */
     ModelMap getBusinessOpportunity(Long enUU, String pCmpCode, String pBrandEn);
 
-    /**
-     * 物料不存在，重新同步物料
-     * @param miss 丢失的物料
-     * @return
-     */
-    ResultMap reuploadProduct(List<Map<String, Object>> miss);
-
     /**
      * 根据enUU和code查找企业物料
      * @param enUU  企业UU
@@ -368,4 +361,11 @@ public interface ProductService {
      * @return
      */
     Long countByEnUU(Long enUU);
+
+    /**
+     * 物料不存在，重新同步物料
+     * @param miss 丢失的物料
+     * @return
+     */
+    ResultMap reuploadProduct(List<Map<String, Object>> miss);
 }

src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
    auto-offset-reset: latest
    group-id: PUBLIC
  profiles:
-   active: dev
+   active: test
 
 kafka:
  consumer:
@@ -33,4 +33,6 @@ sso:
 spring:
  profiles: cloud
  kafka:
-  bootstrap-servers: 10.10.0.69:9291,10.10.0.148:9292,10.10.0.98:9293
+  bootstrap-servers: 10.10.0.69:9291,10.10.0.148:9292,10.10.0.98:9293
+server:
+  port: 8080