Merge remote-tracking branch 'origin/Develop' into Develop

chenshijun

2018-12-20 7396acaaf172f25c7bf110e930a74cc133c5d342

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {