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

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 QiaoJiaSystem/VptServer/CMakeLists.txt

@@ -36,6 +36,9 @@
    VptServerI.cpp
    VptDetectWrapper.cpp
    ./rpc/VptServer.cpp

    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.h
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    #    GlobalSignalWaitLock.hpp
    )