From d56ba0ec51cf2b0afa00bbf6ddb0c02ac16393fa Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 26 Aug 2024 11:16:55 +0800
Subject: [PATCH] fix:分页查询设备接口修改提交

---
 screen-manage/src/main/java/com/moral/api/entity/GroupMenu.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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..90a46bd 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;
 
     /**
@@ -67,10 +70,5 @@
      */
     private String isDelete;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0