Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreInServiceImpl.java

@@ -205,7 +205,9 @@ public class StoreInServiceImpl implements StoreInService {
 			}
 
 		});
-		qualifications.addAll(store.getQualifications());
+		if (!CollectionUtils.isEmpty(store.getQualifications())) {
+			qualifications.addAll(store.getQualifications());
+		}
 		store.setQualifications(qualifications);
 		logger.info(String.format("Start to execute find %s", store != null ? store.toString() : null));
 		return store;

src/main/webapp/resources/js/common/query/material.js

@@ -27,6 +27,11 @@ define([ 'ngResource' ], function() {
                 url: 'trade/products/person',
                 method: 'POST'
             },
+            // 批量保存个人替代物料信息
+            setProductReplacesByPerson: {
+                url: 'trade/products/productReplace',
+                method: 'POST'
+            },
             // 删除所有非标的信息
             deleteUnstandardAll: {
                 url: 'trade/products/unstandard',