From 55bddeb7f2bb55498e9ac179b3c9d513d558b7c7 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 01 Sep 2021 11:02:43 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-api/src/main/java/com/moral/api/entity/Device.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java index 63226a2..1e9e286 100644 --- a/screen-api/src/main/java/com/moral/api/entity/Device.java +++ b/screen-api/src/main/java/com/moral/api/entity/Device.java @@ -136,10 +136,7 @@ @TableField(exist = false) private Version version; - @Override - protected Serializable pkVal() { - return this.id; - } + } -- Gitblit v1.8.0