From 432a477d82c052e99e5a0fb3214ce4d990111592 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 28 九月 2023 14:15:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java index 4441d42..ae7268c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java @@ -35,17 +35,17 @@ /** * 鎺ュ彛param鍒楄〃 - * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSysIntParamVO>gridParam(DockingSysIntParam dockingSysIntParam, Query query); + IPage<DockingSysIntParamVO>gridParam(Map<String,String> condtionMap , Query query); /** * 鎺ュ彛param鍒楄〃 - * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ - IPage<DockingSysIntHeaderVO>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query); + IPage<DockingSysIntHeaderVO>gridHeader(Map<String,String> condtionMap , Query query); } -- Gitblit v1.9.3