From 454e8c85ee7f47ff82fa93d502bde832c8f888f9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:18:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/entity/Device.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index ca4ebc2..7c2670f 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -2,6 +2,8 @@
 
 import java.util.Date;
 
+import javax.persistence.Id;
+
 import lombok.Data;
 
 
@@ -13,6 +15,7 @@
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.id
 	 * @mbggenerated  Wed Nov 29 16:17:59 CST 2017
 	 */
+	@Id
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column device.name

--
Gitblit v1.8.0