Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/GB28181DecoderModel/GB28181Server.cpp

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

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

    return iRet;