From b6d93e08adb11e7f4584173d9d44dbc7c7508e9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 17:50:23 +0800
Subject: [PATCH] 测试冲突

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
new file mode 100644
index 0000000..60c8148
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java
@@ -0,0 +1,10 @@
+package com.dy.pipIrrGlobal.test;
+
+public class TestConflict {
+    public void test1(){
+        System.out.println("test1");
+    }
+    public void test2(){
+        System.out.println("test2");
+    }
+}

--
Gitblit v1.8.0