修复合并代码的图片宽高不对问题

miyanhui

2019-02-12 c089626f2d9ee90364abd24ecba7ffe567cb1163

 QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp

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

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

void TriggerElement::timerFunc() {