From 23bd97eaa5626ad96ca3f5d3e97e93d14705ca6d Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 30 三月 2019 17:50:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yangwu1.3' into 1.3nsq

---
 QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp b/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp
index 44378a5..d10530a 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp
@@ -52,6 +52,7 @@
 
     bool iRet = C_InitSDK(&GBServerParam, &MysqlConnParam, NULL, enventcallback);
     DBG("iRet is " << iRet);
+//    绛夊緟璁惧娉ㄥ唽
     sleep(90);
 
     return iRet;

--
Gitblit v1.8.0