Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

 src/main/resources/system/sysConfig.properties

@@ -27,5 +27,5 @@
e19-standard=50

orgId=5

password=123456

noFilters=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico

specialOrgIds=-1
noFilters=/**/*.css,/**/*.json,/alarm/**,/screen/**,/**/*.jsp,/**/*.js,/**/*.gif,/**/*.png,/**/*.ico,/machineactivate/**,/device/**,/sensor/**,/mobile/**

specialOrgIds=-1,5