From fb444d14fcdaf85cdd717c2cb1446b0f8442748d Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 07 三月 2019 11:46:13 +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/StructureApp/PerimeterElement.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
index 19f3a92..a88ed9f 100644
--- a/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
+++ b/QiaoJiaSystem/StructureApp/PerimeterElement.cpp
@@ -13,7 +13,7 @@
 #include <uuid/uuid.h>
 #include <jsoncpp/json/json.h>
 
-#define ALARM_PERCENT (10)  //10%
+#define ALARM_PERCENT (25)  //25%
 PerimeterElement::PerimeterElement(const SdkRule &rule) :
     m_sdkRule(rule),
     PipeElement(true),

--
Gitblit v1.8.0