Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 bc9bd69850c95dacb22c7da4777a1d0470c33722

 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java

@@ -153,11 +153,15 @@
    private String memberName;

    @ApiModelProperty(value = "折扣类型（discount_type）")
    @DictTrans(target = "memberDiscountTypeStr", codeType = "DISCOUNT_TYPE")
    private String memberDiscountType;
    private String memberDiscountTypeStr;

    @ApiModelProperty(value = "会员折扣")
    private BigDecimal memberDiscountRatio;

    @ApiModelProperty(value = "优惠金额（每扎）")
    private BigDecimal memberDiscountAmount;

    private List<OrderItemListDTO> items;
}