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

pansen

2019-03-15 e2ec42921840535c445e40b76661d0ffd9baef8f

 QiaoJiaSystem/RapidStructureApp/TriggerElement.h

@@ -29,6 +29,8 @@

    bool getTriggerState() const;

    void resetTriggerState();

private:
    bool state;
    bool triggerState;