From 99cf5386df1ed3890fb80b64571c500c4c269a46 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 七月 2017 13:50:25 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java |   56 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java
index 8ac575a..8c2eed5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/entity/OfflineSurveillance.java
@@ -7,13 +7,23 @@
  */
 
 public class OfflineSurveillance  implements Serializable {
-
+    // surveillanceId
     private String surveillanceId;
-    private  String  rawDataPath;
-    private String  camera_in_or_out;
-    private  String create_time;
-    private String  deviceCompanyId;
-    private String  deviceId;
+    // rawDataPath
+    private String rawDataPath;
+    // cameraInOrOut
+    private String cameraInOrOut;
+    // createTime
+    private String createTime;
+    // deviceCompanyId
+    private String deviceCompanyId;
+    // 鏄惁鍚屾
+    private String isSynchron;
+    // 鍚屾澶囨敞
+    private String synchronRemark;
+    // 璁惧id
+    private String deviceId;
+
 
     public String getSurveillanceId() {
         return surveillanceId;
@@ -31,22 +41,40 @@
         this.rawDataPath = rawDataPath;
     }
 
-    public String getCamera_in_or_out() {
-        return camera_in_or_out;
+    public String getCameraInOrOut() {
+        return cameraInOrOut;
     }
 
-    public void setCamera_in_or_out(String camera_in_or_out) {
-        this.camera_in_or_out = camera_in_or_out;
+    public void setCameraInOrOut(String cameraInOrOut) {
+        this.cameraInOrOut = cameraInOrOut;
     }
 
-    public String getCreate_time() {
-        return create_time;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setCreate_time(String create_time) {
-        this.create_time = create_time;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
+    public String getIsSynchron() {
+        return isSynchron;
+    }
+
+    public void setIsSynchron(String isSynchron) {
+        this.isSynchron = isSynchron;
+    }
+
+    public String getSynchronRemark() {
+        return synchronRemark;
+    }
+
+    public void setSynchronRemark(String synchronRemark) {
+        this.synchronRemark = synchronRemark;
+    }
+
+
+
     public String getDeviceCompanyId() {
         return deviceCompanyId;
     }

--
Gitblit v1.8.0