From bb6856a82a588f05040b0410a9747ae8029bb3be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 13 Oct 2023 10:06:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
index 8522a8a..81adacd 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccountRole.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,22 +43,17 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0