From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 20 九月 2024 09:33:06 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java index 225637e..d3d00c5 100644 --- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java +++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java @@ -13,6 +13,7 @@ import com.ycl.platform.domain.vo.screen.MonitorTotalVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.security.core.parameters.P; import java.util.List; import java.util.Map; @@ -49,6 +50,7 @@ * @return 璁惧璧勪骇闆嗗悎 */ public List<TMonitorVO> selectMonitorVOList(); + /** * 鏂板璁惧璧勪骇 * @@ -171,5 +173,5 @@ * @param tMonitor 璁惧璧勪骇 * @return 璁惧璧勪骇闆嗗悎 */ - public List<TMonitorResult> selectMonitorResult(Short cameraFunType); + public List<TMonitorResult> selectMonitorResult(@Param("cameraFunType") Short cameraFunType,@Param("deptIds") List<Integer> deptIds); } -- Gitblit v1.8.0