Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 ef32930eb234fcd5929283b36165d212b0f5fb22

 src/main/resources/system/sysConfig.properties

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

orgId=5

password=123456

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

noFilters=/screen/**,/**/*.jsp,/**/*.js,/**/*.png,/**/*.ico,/machineactivate/**,/device/**,/sensor/**

specialOrgIds=-1,5