From 4319627cf67d19093a18ff724c21782e34fc7a26 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 15:44:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/entity/ManageRole.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
index c2ef650..5a99da7 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageRole.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -36,12 +37,12 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
@@ -54,9 +55,6 @@
private String desc;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0