Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp

@@ -52,6 +52,7 @@

    bool iRet = C_InitSDK(&GBServerParam, &MysqlConnParam, NULL, enventcallback);
    DBG("iRet is " << iRet);
//    等待设备注册
    sleep(90);

    return iRet;