Merge remote-tracking branch 'origin/feature_addPersonTracking' into featur...

pansen

2018-12-26 4001288af80a5e07bb96dd2a7d41d7cb0052a560

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {