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

陶杰

2024-09-27 ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff

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

@@ -52,4 +52,9 @@
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime checkTime;

    @ApiModelProperty(value = "订单号")
    private String orderNo;

    private String orderId;
}