From 87a9119e22d949d4b93fb88a7b9497506990b761 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 29 十二月 2023 11:41:39 +0800
Subject: [PATCH] 2023-12-29 朱宝民 控制器添加、获取水卡状态

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/test/TestConflict.java |    1 +
 1 files changed, 1 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
index bc9b3b2..c672194 100644
--- 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
@@ -12,5 +12,6 @@
         System.out.println("test32");
         System.out.println("test33");
         System.out.println("test34");
+        System.out.println("test33");
     }
 }

--
Gitblit v1.8.0