Merge remote-tracking branch 'origin/release-201815-liusw' into release-201815-liusw

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -1650,6 +1650,7 @@ public class Goods implements Serializable {
 		g.setEncapsulation(product.getEncapsulation());
 		g.setPackaging(product.getPackaging());
 		g.setUuid(product.getCmpUuId());
+        g.setSpec(product.getSpec());
 		return g;
 	}