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

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 QiaoJiaSystem/StructureApp/CMakeLists.txt

@@ -44,7 +44,6 @@
    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp
    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp

    )

SET(LIBS