Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

 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