Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 c28b679fb769c7f0b5a462b7effeae5e25798534

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

@@ -153,7 +153,9 @@
    private String memberName;

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

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