Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

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

@@ -164,4 +164,12 @@
    private BigDecimal memberDiscountAmount;

    private List<OrderItemListDTO> items;

    @ApiModelProperty(value = "优惠券类型（discount_type）")
    @DictTrans(target = "couponDiscountTypeName",codeType = "COUPON_TYPE")
    private String couponDiscountType;
    private String couponDiscountTypeName;

    @ApiModelProperty(value = " 使用条件（满多少钱）")
    private String minOrderAmount;
}