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

pansen

2019-04-22 4d1c2ee860222138fc7932225ea6d91e7483646a

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