Merge branch 'master-modify-cutAmount' into dev

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

@@ -16,6 +16,7 @@ public class OrderPriceVO {
     public BigDecimal realAmount = BigDecimal.ZERO;
     @ApiModelProperty(value = "优惠券扣除的费用")
     public BigDecimal couponAmount = BigDecimal.ZERO;
+
     @ApiModelProperty(value = "参数json")
     public String paramJson = "";