From 91a88471d84246524548a318aec1f22735cfedc9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/entity/Device.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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..646024a 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;
@@ -129,6 +130,12 @@
*/
private String extend;
+ /*
+ * ������������
+ * */
+ @TableField(exist = false)
+ private Version version;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.8.0