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

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/forms/GoodsOrderInfoForm.java

@@ -5,6 +5,7 @@ import com.hcloud.microserver.commoncore.base.BaseForm;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -38,7 +39,7 @@ public class GoodsOrderInfoForm extends BaseForm {
     /**
      * 商品订单详情
      */
-    private List<GoodsOrderDetailForm> goodsOrderDetailForm;
+    private List<GoodsOrderDetailForm> goodsOrderDetailForm=new ArrayList<>();
 
     /**
      * 商品列表