deal_bug_18
Merge branch 'master' of github.com:lifang/qxg_manage