Merge branch 'mwTest-client'

liurunyu

2023-11-27 735f75330030c59f0914c5429035341b4028e5db

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