Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/StructureApp/AppPipeController.h

@@ -109,7 +109,7 @@
    SdkRuleMap m_sdkRuleMap;
    std::string m_localIp;
    std::string getFullFileName();

    std::mutex mutex;
};

#endif // APPPIPECONTROLLER_H