Merge branch 'ywv1.2_yolodebug'

pansen

2019-01-12 29065df908aee41ab673cfc78a0d657e3063d5ef

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {