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

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 QiaoJiaSystem/RapidStructureApp/main.cpp

@@ -5,7 +5,7 @@
using namespace std;

int main(int argc, char **argv) {

    std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
    vector<string> vec;
    vec.push_back("/home/bsk/test/1/load/");
//    vec.push_back("/home/bsk/2/load/");