From c8cc61e84189d8f986f7c4657d543408021b3da0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 12:46:56 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/entity/ManageAccount.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java b/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java
index c796f6e..f7a7b48 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageAccount.java
@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -62,11 +65,15 @@
/**
* ������������
*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* ������������
*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -75,9 +82,6 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0