Merge remote-tracking branch 'origin/master'

tangzy

2021-11-05 98f8d438a976d73e7c4f6434efc8867ebe2a07a5

 src/main/java/org/springblade/modules/information/service/IInformationService.java

@@ -72,14 +72,14 @@
   Map selectWPcount(String jurisdiction,String deptid);
   List<Map<Object,Object>> selectIn(String jurisdiction);
   void deleteDept(String ids);
   IPage selectLi(IPage<List> page,String jurisdiction, String deptid,String stats);
   IPage selectLi(IPage<List> page,String jurisdiction, String deptid,String stats,String startTime,String endTime);
   List<Map<Object,Object>> seCountI(String jurisdiction,String deptid);
   String seCountUm(String jurisdiction,String deptid);
   String seCountUg(String jurisdiction,String deptid);
   Map<String, String> queryYearPz(String year,String jurisdiction,String deptid);
   IPage selectTb(IPage<List> page,String jurisdiction,String enterpriseName);
   IPage  selectJj(IPage<List> page,String jurisdiction,String enterpriseName);
   IPage selectYw(IPage<List> page,String jurisdiction,String deptid,String stats);
   IPage selectYw(IPage<List> page,String jurisdiction,String deptid,String stats,String startTime,String endTime);
   IPage selectUIn(IPage<List> page,String deptid,String name,String hold,String photo,String examinationtype,String dispatch,String soil);
   IPage selectDis(IPage<List> page,String jurisdiction,String deptid,String fid);
   List<Map<Object,Object>> selectFw();