Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-01 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f

 src/main/resources/system/sysConfig.properties

@@ -25,4 +25,7 @@
e17-standard=150

e18-standard=9

e19-standard=50

orgId=-1
orgId=5

password=123456

noFilters=/**/*.css,/**/*.json,/alarm/**,/screen/**,/**/*.jsp,/**/*.js,/**/*.gif,/**/*.png,/**/*.ico,/**/*.html,/**/*.map,/machineactivate/**,/device/**,/sensor/**,/mobile/**,/page/**

specialOrgIds=-1,5