From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature

---
 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