整合json

pansen

2019-01-05 c249ff5ef17e6c1b2d6b1a1314fa83309e93f145

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::threadInitial() {