Merge remote-tracking branch 'origin/yangwu1.3' into yangwu1.3

pans

2019-03-30 99221e4721a1246883465c2b52fbff14eb9aaa7a

 QiaoJiaSystem/GB28181DecoderModel/GlobalSignalWaitLock.hpp

@@ -6,6 +6,7 @@
#define GB28181SDK_GLOBALSIGNALWAITLOCK_H

#include <iostream>
#include <Debug.h>
#include <basic/util/thread/RWLock.hpp>

//#define TryCath(CODE)     try { \