Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

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

specialOrgIds=-1,5