From d4b05c11c07e771bace8c83327e92216748116ca Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期日, 24 四月 2022 16:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

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

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 1e6ef77..95576f3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -4,7 +4,7 @@
 
 
 	/**
-	 * 鏁版嵁搴撹嚜璧營D
+	 * 鏁版嵁搴撹嚜澧濱D
 	 */
 	private int id;
 

--
Gitblit v1.8.0