分支合并dev

change <NAME>
num5 = 500

change zhangsan
changge master

pay function

num4 = 400

num3 = 300

write code

num1 = 100


num2 = 200

num3 = 300


分支合并dev

change <NAME>
num5 = 500

change zhangsan
changge master

pay function

num4 = 400

num3 = 300

write code

num1 = 100


num2 = 200

num3 = 300

