From 2ba0e4c222d707b163d97afb122d3183c99dbf7a Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期一, 02 十二月 2024 09:31:19 +0800 Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5 --- src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementDetailDTO.java | 12 ++++++++++++ 1 files changed, 12 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..8a25482 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,16 @@ @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") @DateTimeFormat private LocalDateTime checkTime; + + @ApiModelProperty(value = "订单号") + private String orderNo; + + private String orderId; + + private Long supplierId;//供应商id + + private String settlementId; + + private String orderItemId; + } -- Gitblit v1.9.3