Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6

 src/main/resources/system/sysConfig.properties

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

e18-standard=9

e19-standard=50

orgId=5212b9dfb55448e699889e01fa0fa6a2
orgId=-1