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

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {