add six
add seven
add eight
Merge branch 'develop'
Conflicts:wj.txt
fixed.
bug fixed
bug2 fixed
Merge branch 'issue-101'
改变bug2逻辑
改变方法3的逻辑
Merge branch 'issue-101'
Conflicts:wj.txt fixed
创建新的开发分支
添加新的需求
Merge branch 'develop'
Conflicts:wj.txt fixed