Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 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 { \