From 141fd8d80cdcf9602dce31a138d82d202d82820e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 14:30:31 +0800
Subject: [PATCH] screen-manage                    添加分配组织admin账号菜单功能

---
 screen-api/src/main/java/com/moral/api/entity/Group.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/Group.java b/screen-api/src/main/java/com/moral/api/entity/Group.java
index 22ed32c..dc0d63e 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Group.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Group.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 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;
 
@@ -20,7 +22,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("`group`")
+@TableName("`groupMenu`")
 public class Group extends Model<Group> {
 
     private static final long serialVersionUID = 1L;
@@ -44,11 +46,13 @@
     /**
      * ������������
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
     /**
      * ������������
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
     /**

--
Gitblit v1.8.0