将num参数改为num2
Merge branch 'study' of https://github.com/luliang/myRep into study

Conflicts:
	bc-test/src/main/java/cn/bc/study/Main.java