From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
index 704cb9f..1e575a0 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/AutomessageSysUserRecord.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,12 +37,13 @@
* 用户id
*/
@ApiModelProperty("用户id")
- private Integer userId;
+ private String userId;
/**
* 访问时间
*/
@ApiModelProperty("访问时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
--
Gitblit v1.7.1