From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/Version.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Version.java b/screen-manage/src/main/java/com/moral/api/entity/Version.java
index a6cd65c..9817adf 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Version.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Version.java
@@ -61,12 +61,10 @@
/*
* ���������������������
* */
+ @TableField(exist = false)
private List<Sensor> sensors;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+
}
--
Gitblit v1.8.0