From 3e76214d0768abe027e10d983015cfb4d820a6d9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 十一月 2021 14:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

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

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java
index 4c71b5c..85c158c 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/VManagerConfig.java
@@ -4,7 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 
 /**    
- * @Description:TODO(杩欓噷鐢ㄤ竴鍙ヨ瘽鎻忚堪杩欎釜绫荤殑浣滅敤)   
+ * @description: 鑾峰彇鏁版嵁搴撻厤缃�   
  * @author: swwheihei
  * @date:   2020骞�5鏈�6鏃� 涓嬪崍2:46:00     
  */

--
Gitblit v1.8.0