Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

 QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp

@@ -53,7 +53,7 @@
    ImageDrawElement m_imageDrawElement;
};

using namespace std;
//using namespace std;
int main(int argc, char *argv[])
{
    SAVE_APP_ARGS