Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-31 9c6e78ea55ef4c865b8148a5ca47322504ed1f50

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

@@ -132,4 +132,7 @@

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

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