From e94e5dbbfc544c558a09fb388e7f4d4341fe8ec4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 16:59:01 +0800
Subject: [PATCH] ci:添加自有权限

---
 screen-api/src/main/java/com/moral/api/entity/ManageAccount.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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 bac1a30..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,10 +3,14 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+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>
@@ -61,12 +65,16 @@
     /**
      * ������������
      */
-    private LocalDateTime createTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
     /**
      * ������������
      */
-    private LocalDateTime updateTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
     /**
      * ������������
@@ -74,9 +82,6 @@
     private String isDelete;
 
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+
 
 }

--
Gitblit v1.8.0