From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
index 9fcc6f6..cb6f473 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/Agreement.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 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;
@@ -49,12 +50,14 @@
      * 修改时间
      */
     @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /**
      * 创建时间
      */
     @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**

--
Gitblit v1.7.1