Merge branch 'yangwu1.3' into 1.3nsq

pansen

2019-04-03 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3

 QiaoJiaSystem/RapidStructureApp/CMakeLists.txt

@@ -16,6 +16,7 @@
    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
    ../../../BasicPlatForm/basic/util/file/FileUtil.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

SET(LIBS