From d9f7c912d27aba37f1cbadd8b9a3acb25eb10e74 Mon Sep 17 00:00:00 2001 From: lizijie <lzjiiie@163.com> Date: Sat, 09 Oct 2021 10:11:01 +0800 Subject: [PATCH] 修改特殊设备更显日志格式 --- screen-manage/src/main/java/com/moral/api/entity/Device.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/entity/Device.java b/screen-manage/src/main/java/com/moral/api/entity/Device.java index b107cba..c978a90 100644 --- a/screen-manage/src/main/java/com/moral/api/entity/Device.java +++ b/screen-manage/src/main/java/com/moral/api/entity/Device.java @@ -1,6 +1,7 @@ package com.moral.api.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; @@ -77,6 +78,11 @@ private Integer organizationId; /** + * ���������/���������/���������������������gov_monitor_point���guid������ + */ + private String guid; + + /** * ������������id */ private Integer deviceVersionId; @@ -129,9 +135,11 @@ */ private String extend; - @Override - protected Serializable pkVal() { - return this.id; - } + /* + * ������������ + * */ + @TableField(exist = false) + private Version version; + } -- Gitblit v1.8.0