From a955c3bf9ee78f9a839726edb030fecf74399d2d Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期四, 20 十二月 2018 19:31:25 +0800
Subject: [PATCH] Merge branch 'Develop'

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

diff --git a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
index 6f0272d..b2b89af 100644
--- a/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
+++ b/QiaoJiaSystem/RapidStructureApp/TriggerElement.cpp
@@ -70,7 +70,7 @@
 }
 
 bool TriggerElement::getTriggerState() const {
-    return triggerState;
+    return state;
 }
 
 void TriggerElement::threadInitial() {

--
Gitblit v1.8.0