From d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 18 Nov 2020 14:39:30 +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..cd16b9f 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=/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