From 9a84ef06adff44bc6e24caa8bc16731eff061f3c Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期日, 25 十月 2020 00:29:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master' into master

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/CancelResponseProcessor.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/CancelResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/CancelResponseProcessor.java
index 1ce6f43..c6fd9b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/CancelResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/CancelResponseProcessor.java
@@ -10,7 +10,7 @@
 
 /**    
  * @Description:CANCEL鍝嶅簲澶勭悊鍣�
- * @author: songww
+ * @author: swwheihei
  * @date:   2020骞�5鏈�3鏃� 涓嬪崍5:32:23     
  */
 @Component

--
Gitblit v1.8.0