From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 15 九月 2023 08:48:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java index 6882ada..9f1c212 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java @@ -11,6 +11,8 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import java.util.Map; + /*** * 绯荤粺鎺ュ彛绠＄悊-鎺ュ彛閰嶇疆鏈嶅姟 * @author xiejun @@ -21,10 +23,10 @@ /** * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃 - * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query); + IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query); /** * 澧炲姞 绯荤粺闆嗘垚鐨勬帴鍙ｇ鐞嗕俊鎭� @@ -37,7 +39,7 @@ * @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞� * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞� */ - boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO); + boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable; /*** * 鏇存柊鎺ュ彛閰嶇疆淇℃伅鐘舵�� @@ -49,7 +51,7 @@ /*** * 鎵嬪姩鍚屾鎺ュ彛锛屽彧鏈夋帹閫佺殑鎵嶄細 - * @param dockingSystemConfig + * @param dockingSystemConfigDTO * @return * @throws VciBaseException */ -- Gitblit v1.9.3