2024-01-16 朱宝民 合并代码

Administrator

2024-01-16 8ed16da7d96f1b0b954d75c20ea5177d23ad9eaf

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

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