改兼容
Merge branch 'Branch_v0.2' of github.com:lizzyphy/lab_baozha into Branch_v0.2