From 4a1845ab43395de6838e535bdf7ca932316ee9ec Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 10:30:18 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/RapidStructureApp/TriggerElement.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.h b/QiaoJiaSystem/RapidStructureApp/TriggerElement.h
index ce6e32d..3c4627f 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.h
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.h
@@ -29,6 +29,8 @@
 
     bool getTriggerState() const;
 
+    void resetTriggerState();
+
 private:
     bool state;
     bool triggerState;

--
Gitblit v1.8.0