From 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/system/sysConfig.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/system/sysConfig.properties b/src/main/resources/system/sysConfig.properties
index 781d3c7..8caf11a 100644
--- a/src/main/resources/system/sysConfig.properties
+++ b/src/main/resources/system/sysConfig.properties
@@ -27,4 +27,5 @@
 e19-standard=50
 orgId=5
 password=123456
-noFilters=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico
\ No newline at end of file
+noFilters=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico,/machineactivate/**,/device/**,/sensor/**
+specialOrgIds=-1,5
\ No newline at end of file

--
Gitblit v1.8.0