Merge branch 'Develop' into feature_uploadPersonCutImage

pansen

2019-01-10 16b03534075d4fdbe2ec9cf3860874d91f24c01b

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {