Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

 src/main/resources/system/sysConfig.properties

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

e18-standard=9

e19-standard=50

orgId=-1

orgId=5

password=123456

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

specialOrgIds=-1