Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.java

@@ -51,7 +51,7 @@
   List<Map<Object,Object>> selectExtype(String deptid,String jurisdiction);
   List<Map<Object,Object>> selectHold(String deptid,String jurisdiction);
   List<Map<Object,Object>> selectDis(String deptid);
   List<Map<Object,Object>> selectDisp(String deptid);
   List<Map<Object,Object>> selectDisp(String deptid,String jurisdiction);
   List<Map<Object,Object>> selectSoil(String deptid);

   /**