楚江ERP:发货单-替换包装费取值字段

@@ -81,7 +81,7 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
      * 包装费
      */
     @ApiModelProperty("包装费")
-    private String packagingFee;
+    private BigDecimal packagingFee;
 
     /**
      * 运费

@@ -73,7 +73,7 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
      * 包装费
      */
     @TableField(exist = false)
-    private String packagingFee;
+    private BigDecimal packagingFee;
 
     /**
      * 运费

@@ -48,7 +48,7 @@
                 ELSE '其它'
                 END AS order_type,
             o.ordering_unit AS customer_id,
-            o.packaging_fee,
+            ol.packaging_fee,
             o.shipping_cost,
             c.name AS customer_name,
             tb.order_spec_id,
@@ -220,7 +220,7 @@
             o.ordering_unit AS customer_id,
             o.delivery_method,
             o.settlement_terms,
-            o.packaging_fee,
+            ol.packaging_fee,
             o.shipping_cost,
             sc.type as contract_type,
             CASE