From 0920f23406e52e4c7149515797a317c836c9e065 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 10 Nov 2023 09:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/Version.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Version.java b/screen-api/src/main/java/com/moral/api/entity/Version.java
index 91e74d8..74d5385 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Version.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Version.java
@@ -64,9 +64,6 @@
private List<Sensor> sensors;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0