From bf4249273b9664073993c71db2cb444f5c66d2af Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Fri, 17 Sep 2021 14:14:17 +0800 Subject: [PATCH] 特殊设备历史表查询接口修改,无人机走航车秒数据补偿接口修改 --- screen-api/src/main/java/com/moral/api/entity/Device.java | 10 ++++++---- 1 files changed, 6 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..beec53d 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 @@ -78,6 +78,11 @@ private Integer organizationId; /** + * ���������/���������/���������������������gov_monitor_point���guid������ + */ + private String guid; + + /** * ������������id */ private Integer deviceVersionId; @@ -136,10 +141,7 @@ @TableField(exist = false) private Version version; - @Override - protected Serializable pkVal() { - return this.id; - } + } -- Gitblit v1.8.0