From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderRefund.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 4e72dac..4f762b6 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
@@ -5,6 +5,8 @@
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_charging_order_refund")
-@ApiModel(value="TChargingOrderRefund对象", description="")
+@ApiModel(value="TChargingOrderRefund对象1", description="")
public class TChargingOrderRefund implements Serializable {
private static final long serialVersionUID = 1L;
@@ -56,6 +58,7 @@
@ApiModelProperty(value = "退款成功时间")
@TableField("refund_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime refundTime;
@ApiModelProperty(value = "订单编号")
@@ -96,7 +99,11 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "支付时间")
@TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime payTime;
-
-
+ @ApiModelProperty(value = "订单id")
+ @TableField(exist = false)
+ private String orderId;
+ @TableField(exist = false)
+ private String userId;
}
--
Gitblit v1.7.1