测试git冲突

liurunyu

2023-12-01 88cd0922634e6bb20da6ea64209bd62d094b6b4c

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java

@@ -7,4 +7,7 @@
    public void test2(){
        System.out.println("test2");
    }
    public void test3(){
        System.out.println("test3");
    }
}