Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

 src/main/resources/system/sysConfig.properties

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

e18-standard=9

e19-standard=50

orgId=-1
orgId=-1

password=123456

noFilters=login