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

pansen

2019-02-28 bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e

 QiaoJiaSystem/RapidStructureApp/TriggerElement.h

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

    bool getTriggerState() const;

    void resetTriggerState();

private:
    bool state;
    bool triggerState;