测试git冲突

liurunyu

2023-12-01 43cef17ebd5b267e12fe5aa9c955ef71e9d0f2a4

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

@@ -10,5 +10,7 @@
    public void test3(){
        System.out.println("test31");
        System.out.println("test32");
        System.out.println("test33");
        System.out.println("test34");
    }
}