From eb750e26fe6ea5d82fe594c63c78d3cab3f0b390 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十一月 2024 00:18:58 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
index 12c2bdf..9d6430c 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java
@@ -40,6 +40,7 @@
@TableField("refund_code")
private String refundCode;
+
@ApiModelProperty(value = "退款金额")
@TableField("refund_amount")
private BigDecimal refundAmount;
@@ -58,7 +59,7 @@
@ApiModelProperty(value = "退款成功时间")
@TableField("refund_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime refundTime;
@ApiModelProperty(value = "订单编号")
@@ -99,7 +100,7 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "支付时间")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime payTime;
@ApiModelProperty(value = "订单id")
@TableField(exist = false)
--
Gitblit v1.7.1