From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期二, 26 三月 2024 15:49:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java index c0f88be..9ebdecf 100644 --- a/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java +++ b/ard-work/src/main/java/com/ruoyi/app/application/service/IArdAppApplicationService.java @@ -77,5 +77,7 @@ public int approvalCheckPositionOwn(String soilderId,Map<String,String> para); - public List<Map<String,Object>> getCheckPositionNo(String commanderId); + public List<Map<String,Object>> getCheckPositionNo(String commanderId);/// + + public Map<String,Map<String,List<Map<String,Object>>>> getSoilderAndCarPositionByCommanderId(String commanderId,Map<String, Double> para); } -- Gitblit v1.9.3