From e05adb8da62b72798fe273454d51bb36b2ee72de Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 May 2021 15:56:16 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
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