From 3f9f3c40338190497d42c891dc0690789b834df6 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期三, 12 二月 2025 13:19:55 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java
index a161f9f..52c2a8d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java
@@ -11,6 +11,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -58,7 +59,7 @@
@ApiModelProperty(value = "支付时间")
@TableField("pay_time")
- private LocalDateTime payTime;
+ private Date payTime;
@ApiModelProperty(value = "支付方式")
@TableField("pay_type")
@@ -74,15 +75,12 @@
@ApiModelProperty(value = "支付的回调时间")
@TableField("callback_time")
- private LocalDateTime callbackTime;
+ private Date callbackTime;
- @ApiModelProperty(value = "订单创建时间")
- @TableField("create_time")
- private LocalDateTime createTime;
+ @ApiModelProperty(value = "订单状态：0.待支付 1.已支付")
+ @TableField("status")
+ private Integer status;
- @ApiModelProperty(value = "订单更新时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
}
--
Gitblit v1.7.1