Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/StructureApp/PerimeterElement.cpp

@@ -25,7 +25,7 @@
    m_bIsMask(true),
    m_bSetWH(false),
    pointArray(nullptr),
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcServerPort"),"tcp")
    m_rpcClient("RtspAnalysServer", "127.0.0.1",appPref.getIntData("RpcVTIMPort"),"tcp")
{

    pManagerEsDB = new EsDBTool(appPref.getStringData("ipAdd"), appPref.getIntData("ipPort"));