Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/jingdan/service/impl/JingdanServiceImpl.java

@@ -57,11 +57,11 @@
   }

   @Override
   public void insert(String galarmPeople,String phoneNumber,String place,String content,
   public void 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) {
      baseMapper.insert(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
      baseMapper.inserts(galarmPeople,phoneNumber,place,content,galarmTime,waringType,deviceNumber,type,handleP,handleTime,handName,level,coordinate,jd,wd,addvcd,rName,czTime,bz);
   }

   @Override
@@ -74,4 +74,9 @@
      baseMapper.updateInfo(id, handleP, handName,handletype,type);
   }

   @Override
   public int submitReId(JingdanVO jingdanVO) {
      return baseMapper.submitReId(jingdanVO);
   }

}