Merge branch 'dev'

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

src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -1060,7 +1060,7 @@ public class ProductServiceImpl implements ProductService {
                 enuu = product.getEnUU();
                 break;
             } else {
-                productIds.remove(id);
+                System.err.println(id + "----------------------------");
             }
         }
         //筛选已经存在个人物料库的信息