Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 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