From dd202fbaa4caea48aa5a0df620b87a6e41dba429 Mon Sep 17 00:00:00 2001 From: tangzy <tangzy123456> Date: Fri, 12 Mar 2021 16:24:44 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-BladeX --- blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java index 14508b6..08d4c9e 100644 --- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java +++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/mapper/JingdanMapper.java @@ -47,7 +47,7 @@ * @param endTime * @return */ - List<JingdanVO> selectList(IPage page,String waringType, String beginTime, String endTime, String addvcd, String type); + List<JingdanVO> selectList(String waringType, String beginTime, String endTime, String addvcd, String type); List<JingdanVO> selectLists(String handleP, String type); /** @@ -57,7 +57,7 @@ */ List<JingdanVO> selectdInfo(String deviceNumber, String id); - int insert(String galarmPeople, String phoneNumber, String place, String content, + int inserts(String galarmPeople, String phoneNumber, String place, String content, String galarmTime, String waringType, String deviceNumber, String type, String handleP, String handleTime, String handName, String level, String coordinate, String jd, String wd, String addvcd, String rName, String czTime, String bz); -- Gitblit v1.9.3