From eeb3b46afe7da500bce62daad35ded0886df3b88 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期四, 09 一月 2025 18:31:12 +0800 Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4 --- 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