From d666793c93e91026e129f00bae414217690635ae Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 27 May 2021 13:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java b/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java
index 96cf300..7adb89b 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java
@@ -4,7 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
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;
@@ -45,7 +46,7 @@
/**
* ������
*/
- private Integer channel;
+ private String channelKey;
/**
* ������Id
@@ -55,11 +56,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