Merge branch 'Develop'

pansen

2018-12-26 e1d7e82725a6ee591b399f89544b64a4f07b624d

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {