From 943a2364c76db4c4e570e0d0219a81b6caa9bffc Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 13 May 2021 14:27:08 +0800 Subject: [PATCH] deivce相关接口 --- screen-api/src/main/java/com/moral/api/entity/GroupMenu.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java b/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java index 83bd929..b91ca86 100644 --- a/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java +++ b/screen-api/src/main/java/com/moral/api/entity/GroupMenu.java @@ -3,8 +3,11 @@ 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; @@ -41,7 +44,7 @@ /** * ������ */ - private Integer channel; + private String channelKey; /** * ������Id @@ -51,12 +54,14 @@ /** * ������������ */ - private LocalDateTime createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; /** * ������������ */ - private LocalDateTime updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; /** * ������������ -- Gitblit v1.8.0