From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期四, 27 十月 2022 13:28:32 +0800 Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java index cba09cb..9fc992f 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/BaseDO.java @@ -1,12 +1,11 @@ package com.panzhihua.service_community.model.dos; +import java.util.Date; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import java.util.Date; +import lombok.Data; /** * @Author: llming @@ -14,12 +13,13 @@ */ @Data public class BaseDO { - private Long creatBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Long createBy; + @TableField(fill = FieldFill.INSERT) private Date createAt; + private Long updateBy; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField(fill = FieldFill.INSERT) + private Date updateAt; } -- Gitblit v1.7.1