Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

pansen

2019-01-05 f53e1204bd4a21f74cb5872030f1eadf231eedc7

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {