From 2719424e8639a508f716dca2aaa05c340778dff1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:12:06 +0800
Subject: [PATCH] 解决冲突

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
index b53618f..f9ff701 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
@@ -26,5 +26,5 @@
 	DockingSystemVO editSave(DockingSystemDTO dockingSystemDTO);
 
 
-	boolean delSystemData(DockingSystemDTO dockingSystemDTO);
+	boolean deleteDataById(String oids);
 }

--
Gitblit v1.9.3