Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 fd6b130ed52e1412ccb1ff8bf7891a90a6f96d31

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::timerFunc() {