From b565523684b9c3c9f103d691db0dcf36022ab529 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 三月 2022 14:56:15 +0800
Subject: [PATCH] Merge pull request #403 from brewswang/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index aff1671..01d340c 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -4,11 +4,6 @@
 public class Device {
 
 	/**
-	 * Id
-	 */
-	private int id;
-
-	/**
 	 * 璁惧Id
 	 */
 	private String deviceId;
@@ -110,7 +105,7 @@
 	private boolean firsRegister;
 
 	/**
-	 * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+	 * 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
 	 */
 	private String charset ;
 
@@ -119,13 +114,7 @@
 	 */
 	private int subscribeCycleForCatalog ;
 
-	public int getId() {
-		return id;
-	}
 
-	public void setId(int id) {
-		this.id = id;
-	}
 
 	public String getDeviceId() {
 		return deviceId;
@@ -294,6 +283,4 @@
 	public void setSubscribeCycleForCatalog(int subscribeCycleForCatalog) {
 		this.subscribeCycleForCatalog = subscribeCycleForCatalog;
 	}
-
-
 }

--
Gitblit v1.8.0