From 3a82a5078037deef31caf3694acc36c4f386ffb3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 11:14:43 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java b/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
index f742eb3..b323cf5 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/entity/BaseEntity.java
@@ -1,21 +1,25 @@
package com.xzx.gc.common.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import java.io.Serializable;
import java.util.Date;
@Data
-public class BaseEntity {
+public class BaseEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
- private String createBy;
+ private String createdBy;
- private Date createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdTime;
- private String delFlag;
+ private short delFlag;
private Integer revision;
--
Gitblit v1.9.1