From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/system/sysConfig.properties b/src/main/resources/system/sysConfig.properties
index d2a12c9..0f55c1a 100644
--- a/src/main/resources/system/sysConfig.properties
+++ b/src/main/resources/system/sysConfig.properties
@@ -25,6 +25,7 @@
 e17-standard=150
 e18-standard=9
 e19-standard=50
-orgId=-1
+orgId=5
 password=123456
-noFilters=login
\ No newline at end of file
+noFilters=/**/*.css,/**/*.json,/alarm/**,/screen/**,/**/*.jsp,/**/*.js,/**/*.gif,/**/*.png,/**/*.ico,/machineactivate/**,/device/**,/sensor/**,/mobile/**
+specialOrgIds=-1,5
\ No newline at end of file

--
Gitblit v1.8.0