From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/Device.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 36ec4d7..1c01911 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -19,6 +20,7 @@
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
@Id
+ @GeneratedValue(generator = "JDBC")
private Integer id;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.name
@@ -76,7 +78,7 @@
*/
private Integer deviceVersionId;
private String isDelete;
- private String professionId;
+ private Integer professionId;
/**
* Sets the uid.
*
@@ -115,4 +117,6 @@
private List<Integer> organizationIds;
@Transient
private Profession profession;
+ @Transient
+ private DeviceProperty deviceProperty;
}
\ No newline at end of file
--
Gitblit v1.8.0