From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期五, 11 十月 2024 08:41:04 +0800 Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2 --- src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java index b2dd6bf..75794f2 100644 --- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java +++ b/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; } -- Gitblit v1.9.3