Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-04 498557d0fd3b2bc14b446626cbc8a63a52fa83cb

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

@@ -82,4 +82,7 @@

    @ApiModelProperty(value = "快递单号")
    private String deliveryNo;//快递单号

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