兼容开发版
Merge branch 'master' of github.com:feicm/jnjjAppIn