From 1e6dbe352c35a54c299008c523e38b1e59d1ea03 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 14:01:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/entity/GroupMenu.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 942572f..a2aefdf 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,7 @@
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;
@@ -43,7 +44,7 @@
/**
* ������
*/
- private Integer channel;
+ private String channelKey;
/**
* ������Id
@@ -53,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;
/**
@@ -66,9 +69,6 @@
private String isDelete;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0