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

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -1049,6 +1049,7 @@ export default {
       this.form.centerShipCostList.push({
         parentId: this.form.id,
         billType: 1,
+        costType:0,
         goodsNum: this.form.goodsTotalNum,
         $cellEdit: true
       });

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -1176,6 +1176,7 @@ export default {
       this.form.centerShipCostList.push({
         parentId: this.form.id,
         billType: 2,
+        costType:0,
         $cellEdit: true
       });
     },
@@ -1186,6 +1187,7 @@ export default {
       this.form.centerShipPaymentCostList.push({
         parentId: this.form.id,
         billType: 2,
+        costType:1,
         $cellEdit: true
       });
     },