Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2023-12-01 c40d049233f2706dd23aadf327dbf86ba0008a12

1
2
3
4
5
6
7
8
9
10
package com.dy.pipIrrGlobal.test;
 
public class TestConflict {
    public void test1(){
        System.out.println("test1");
    }
    public void test2(){
        System.out.println("test2");
    }
}