From b1bfa089b5b299c1c3c71094e450748a5e5e8a75 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Aug 2023 15:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into dev
---
screen-api/src/main/java/com/moral/api/entity/UserLog.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/UserLog.java b/screen-api/src/main/java/com/moral/api/entity/UserLog.java
index 416fef5..6835e47 100644
--- a/screen-api/src/main/java/com/moral/api/entity/UserLog.java
+++ b/screen-api/src/main/java/com/moral/api/entity/UserLog.java
@@ -63,9 +63,6 @@
private Date createTime;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0