Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-04 71af09a7d35a1146122776bebac8d51c1903beed

 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=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico
noFilters=/**/*.css,/**/*.json,/alarm/**,/screen/**,/**/*.jsp,/**/*.js,/**/*.gif,/**/*.png,/**/*.ico,/machineactivate/**,/device/**,/sensor/**

specialOrgIds=-1,5