From 080830b1bcf5339aac9013d279cacd2d08bbda80 Mon Sep 17 00:00:00 2001 From: chen_xi <276999030@qq.com> Date: Mon, 14 Nov 2022 17:20:23 +0800 Subject: [PATCH] 剔除小时数据中时间重复的数据 --- screen-api/src/main/java/com/moral/api/entity/Menu.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/entity/Menu.java b/screen-api/src/main/java/com/moral/api/entity/Menu.java index 916591e..2da0df2 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Menu.java +++ b/screen-api/src/main/java/com/moral/api/entity/Menu.java @@ -1,10 +1,14 @@ package com.moral.api.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; 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; @@ -31,6 +35,7 @@ /** * ��������� */ + @TableField(value = "`name`") private String name; /** @@ -51,17 +56,20 @@ /** * ��������������������������� */ + @TableField(value = "`order`") private Integer order; /** * ������������ */ - 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; /** * ������������ @@ -69,9 +77,6 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + } -- Gitblit v1.8.0