From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001 From: lin <sbla5888@163.com> Date: Thu, 14 Mar 2024 18:15:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java index c25ee7b..22c2df0 100644 --- a/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java +++ b/src/main/java/org/springblade/modules/task/entity/TaskBailReportingEventEntity.java @@ -16,6 +16,8 @@ */ package org.springblade.modules.task.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -84,7 +86,7 @@ * 确认用户ID */ @ApiModelProperty(value = "确认用户ID") - private Integer confirmUserId; + private Long confirmUserId; /** * 确认用户ID */ @@ -184,4 +186,16 @@ @ApiModelProperty(value = "返回-位置图片") private String returnImageUrls; + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "更新时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + } -- Gitblit v1.9.3