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

wuzeyu

2023-11-30 ee6e575076ba17c1fc8f4ba33253b7ea0fba45f8

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");
    }
}