From e2411fee13ff406db4aa5d994d7dcffdf4482cab Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 06 Sep 2023 14:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java b/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java
index efbf0c8..5daa7ef 100644
--- a/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java
+++ b/screen-api/src/main/java/com/moral/api/entity/MonitorPoint.java
@@ -100,9 +100,6 @@
private List<Device> devices;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0