From 8a28bb397d5743edf1da5930db0d6d0fdd86b35e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 18:10:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
index f03796e..eb0dca5 100644
--- a/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
+++ b/src/main/java/org/springblade/modules/property/entity/PropertyCapitalApplyEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.property.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -109,11 +106,15 @@
* 预计开工时间
*/
@ApiModelProperty(value = "预计开工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date runTime;
/**
* 预计竣工时间
*/
@ApiModelProperty(value = "预计竣工时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date completedTime;
/**
* 项目摘要
@@ -136,6 +137,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -143,6 +145,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
@ApiModelProperty("创建时间")
private Date createTime;
@@ -151,6 +154,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -158,6 +162,7 @@
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty("更新时间")
private Date updateTime;
--
Gitblit v1.9.3