Merge branch 'feature_uploadPersonCutImage' into ywv1.2

pansen

2019-01-10 7734dad8901d8ee40f5a7ba5d04800ca41540dab

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {