From 0b39a6b4f6962d9454a61d34bba2098ffa3993a9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 20 四月 2025 01:51:14 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
index 07e4c22..0e27936 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Invite.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -30,12 +31,13 @@
      */
     @TableField("registerTime")
     @ApiModelProperty("注册时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date registerTime;
     /**
      * 使用范围(1=用户,2=司机)
      */
-    @TableField("useType")
-    private Integer useType;
+    @TableField("userType")
+    private Integer userType;
 
     @TableField(exist = false)
     @ApiModelProperty("头像")

--
Gitblit v1.7.1