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

陶杰

2024-09-02 1c8b2509fe7d990fd0b9f9ed6b338c6203d54758

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

@@ -9,6 +9,7 @@

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
public class OrderDTO extends AbstractTransDTO {
@@ -132,4 +133,10 @@

    @ApiModelProperty(value = "是否可质检退款")
    private boolean couldCheckRefund;

    @ApiModelProperty(value = "支付单号")
    private String paymentTrId;

    @ApiModelProperty(value = "积分商品列表")
    private List<OrderPointGoodsListDTO> pointGoodsList;
}