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,9 +1,25 @@
public class Main {
    public static void main(String[] args)throws Exception{
        System.out.println(44433333);
    }
    
    public static void out(){}
    public static void mai3n(String[] args)throws Exception{
        System.out.println(555333333);
    }
    public static void maind(String[] args)throws Exception{
        System.out.println(333333333);
    }
    
    
    public static void sss(String[] args)throws Exception{
        System.out.println(333333333);
    }
}