From 9cb298004c7ca4c75ad5faf0234531aa21c99c5c Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 05 Jul 2021 14:23:41 +0800 Subject: [PATCH] screen-manage 实时数据界面单位转换以及code转换 --- screen-api/src/main/java/com/moral/api/entity/GroupMenu.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 7d4264d..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,6 +3,8 @@ 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; @@ -42,7 +44,7 @@ /** * ������ */ - private Integer channel; + private String channelKey; /** * ������Id @@ -52,11 +54,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