From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/DeviceVersion.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/DeviceVersion.java b/src/main/java/com/moral/entity/DeviceVersion.java
index f11b731..0c91758 100644
--- a/src/main/java/com/moral/entity/DeviceVersion.java
+++ b/src/main/java/com/moral/entity/DeviceVersion.java
@@ -5,7 +5,6 @@
import javax.persistence.Id;
import java.util.Date;
-
@Data
public class DeviceVersion {
@Id
@@ -17,5 +16,9 @@
private Date createTime;
+ private Date updateTime;
+
+ private Boolean isDelete;
+
private String description;
}
\ No newline at end of file
--
Gitblit v1.8.0