Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

 src/main/resources/system/sysConfig.properties

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

e18-standard=9

e19-standard=50

orgId=5212b9dfb55448e699889e01fa0fa6a2
orgId=-1

password=123456

noFilters=login