From c23a52929641484ed0b4ca728630f6d74872da8b Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 28 三月 2022 14:36:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.91chi.fun/https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 761437f..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
@@ -105,7 +105,7 @@
 	private boolean firsRegister;
 
 	/**
-	 * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+	 * 瀛楃闆�, 鏀寔 UTF-8 涓� GB2312
 	 */
 	private String charset ;
 

--
Gitblit v1.8.0