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

pansen

2019-01-15 9bbbe29c81aa9cd183e840232f2bd973937d1ef4

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {