From d77aa9268ed02e7bda8a67aab2213e42cb5afcf4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 六月 2023 13:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/YouTuiDriver.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/YouTuiDriver.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/YouTuiDriver.java
index 914bf3d..6d0b610 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/YouTuiDriver.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/YouTuiDriver.java
@@ -51,7 +51,7 @@
* 优推结束时间
*/
@TableField("endTime")
- private Integer endTime;
+ private Date endTime;
/**
* 状态（1=未使用，2=使用中，3=已结束）
*/
--
Gitblit v1.7.1