Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

 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;
}