From d7ee12cb208473741f79b64505adccd0653e4654 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 27 Oct 2020 13:44:28 +0800
Subject: [PATCH] vue页面增加误差率参数，沧州剔除非本公司设备显示，报表接口更新
---
src/main/java/com/moral/entity/Device.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index dae7f3d..a69aa52 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
@@ -115,4 +117,9 @@
private List<Integer> organizationIds;
@Transient
private Profession profession;
+ @Transient
+ private DeviceProperty deviceProperty;
+
+ @Transient
+ private Boolean hasWindInfo;
}
\ No newline at end of file
--
Gitblit v1.8.0