合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

@@ -78,7 +78,13 @@
    lastDown = 0;
    triggerType = DOWN;
}
void TriggerElement::resetTriggerState()
{

    //state=false;
    triggerState=false;
    triggerTimes=0;
}

void TriggerElement::timerFunc() {