diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java index d5eaeba3..0cc76b0c 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyEntity.java @@ -11,6 +11,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; import java.lang.reflect.Field; +import java.sql.Date; import java.sql.Timestamp; @@ -32,12 +33,12 @@ public class MyEntity extends MyObject { @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Timestamp createTime; + private Date createTime; @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private Timestamp updateTime; + private Date updateTime; /* 分组校验 */ public @interface Create { diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java index ce6f62f4..10e433e6 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/base/MyLogicEntity.java @@ -12,6 +12,7 @@ import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.format.annotation.DateTimeFormat; import java.lang.reflect.Field; +import java.sql.Date; import java.sql.Timestamp; /** @@ -35,12 +36,12 @@ public class MyLogicEntity extends MyObject { @ApiModelProperty(value = "创建时间", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp createTime; + private Date createTime; @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间", hidden = true) @JSONField(format = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Timestamp updateTime; + private Date updateTime; @ApiModelProperty(value = "数据有效性", hidden = true) @TableLogic @TableField("available")