From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 13:16:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/resources/system/sysConfig.properties b/src/main/resources/system/sysConfig.properties
index cae11b1..cd16b9f 100644
--- a/src/main/resources/system/sysConfig.properties
+++ b/src/main/resources/system/sysConfig.properties
@@ -25,7 +25,7 @@
 e17-standard=150
 e18-standard=9
 e19-standard=50
-orgId=-1
+orgId=5
 password=123456
-noFilters=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico
-specialOrgIds=-1
\ No newline at end of file
+noFilters=/web/**,/**/*.css,/**/*.json,/alarm/**,/screen/**,/**/*.jsp,/**/*.js,/**/*.gif,/**/*.png,/**/*.ico,/**/*.html,/**/*.map,/machineactivate/**,/device/**,/sensor/**,/mobile/**,/page/**,/swagger*/**,/v2/**,/webjars/**,/demo/**,/weixin/alarm-show
+specialOrgIds=5
\ No newline at end of file

--
Gitblit v1.8.0