merge Dev into Current

pansen

2018-12-19 753128ce82ff3ce8c9617768b88378f785a6088b

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {