Merge branch 'Develop'

chenshijun

2018-12-20 a955c3bf9ee78f9a839726edb030fecf74399d2d

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {