From 7d797c3f197371bb66c8ed3e60327817e9f0364c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 28 八月 2024 13:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
index 618977e..db5a856 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -3,6 +3,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
+
@Data
public class PayOrderDto {
private String id;
@@ -23,7 +25,11 @@
private Double orderAmount;
@ApiModelProperty("支付金额")
private Double paymentAmount;
- private java.sql.Timestamp createTime;
- private java.sql.Timestamp endTime;
+ @ApiModelProperty("下单时间")
+ private LocalDateTime createTime;
+ @ApiModelProperty("订单完成时间")
+ private LocalDateTime endTime;
+ @ApiModelProperty("支付时间")
+ private LocalDateTime payTime;
}
--
Gitblit v1.7.1