From 7e5452d35bb30dad5bc9e37360047b5a43732dcd Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 27 Jul 2023 15:35:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' 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