From 0a762a217fe499b7b63d55ed4b46dde1afd49f28 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 15 四月 2019 16:57:06 +0800
Subject: [PATCH] .3nsq: Auto stash before merge of "1.3nsq" and "origin/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