Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::timerFunc() {