Merge QiaojiaoSystem Code (svn version is r3345)

pansen

2018-12-19 ae87bf6bbddb781ff7316d032f8dc2302fb608ec

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

@@ -70,7 +70,7 @@
}

bool TriggerElement::getTriggerState() const {
    return triggerState;
    return state;
}

void TriggerElement::threadInitial() {