From ba5fb9cec090e0cf8ba32d0714f5d9a4430081b4 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 01 十一月 2024 16:27:08 +0800 Subject: [PATCH] merge --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java index 5bb36ce..ae3424d 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderInfoDto.java @@ -1,5 +1,6 @@ package com.ruoyi.order.dto; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -19,9 +20,11 @@ @ApiModelProperty("支付金额") private BigDecimal payAmount; @ApiModelProperty("支付时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime payTime; @ApiModelProperty("退款金额") private BigDecimal refundAmount; + private BigDecimal rechargeAmount; } -- Gitblit v1.7.1