整合代码

整合代码