Merge remote-tracking branch 'origin/dev-mysql' into erp_batchToGoods_20180117

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -143,6 +143,8 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
                 }
 
                 products.get(0).setErpReserve(productDetailERP.getReserve());
+                products.get(0).setProduceDate(productDetailERP.getProduceDate());
+                products.get(0).setPrice(productDetailERP.getPrice());
                 productList.add(products.get(0));
             }
         }