补回凯敏的代码
Merge branch 'master' of github.com:hkaimin/JXJYPro
再次补回凯敏代码 - guo