Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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

specialOrgIds=-1,5