Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/uas/ps/product/service/ProductService.java

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

@@ -264,6 +264,13 @@ 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
@@ -361,11 +368,5 @@ public interface ProductService {
      * @return
      */
     Long countByEnUU(Long enUU);
-
-    /**
-     * 物料不存在，重新同步物料
-     * @param miss 丢失的物料
-     * @return
-     */
-    ResultMap reuploadProduct(List<Map<String, Object>> miss);
+>>>>>>>>> Temporary merge branch 2
 }