From ee2d9a4049baa9ecc3f43d0576fd3745688171be Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 02 Aug 2023 13:40:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- 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