兼容旧的选择方法
Merge remote-tracking branch 'origin/develop' into develop