Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 QiaoJiaSystem/RapidStructureApp/TriggerElement.h

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

    bool getTriggerState() const;

    void resetTriggerState();

private:
    bool state;
    bool triggerState;