branch test
增加了一个公共变量ip
Merge branch 'dev2'