Merge branch 'ywv1.2' into ywv1.2_布控feature

pans

2019-01-28 53630c440d592792dcdd86f8d5b2c59da4f3c359

 QiaoJiaSystem/RapidStructureApp/TriggerElement.h

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

    bool getTriggerState() const;

    void resetTriggerState();

private:
    bool state;
    bool triggerState;