Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/VCTEST.git into

dev

Conflicts:
	src/main/java/Main.java

src/main/java/Main.java

@@ -1,6 +1,6 @@
public class Main {
    public static void main(String[] args)throws Exception{
    public static void main(String[] args)throws Exception{
        System.out.println(66633);
    }