From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
index ffd70d3..144fd34 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -51,7 +52,7 @@
@ApiModelProperty(value = "支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
- private LocalDateTime payTime;
+ private Date payTime;
}
--
Gitblit v1.7.1