Merge remote-tracking branch 'origin/master'

zengh

2021-08-15 0cab6d8afcc97e8bc94ef200e24d8839281f44c8

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

@@ -61,9 +61,9 @@
   Map<String, String> queryYearCz(String year,String jurisdiction,String deptid);
   Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
   Map<String, String> queryYearBanan(String year,String jurisdiction,String deptid);
   List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid);
   List<Map<Object,Object>> selectExtype(String jurisdiction,String deptid,String type);
   List<Map<Object,Object>> selectJur();
   List<Map<Object,Object>> selectBx(String jurisdiction,String deptid);
   List<Map<Object,Object>> selectBx(String jurisdiction,String deptid,String type);
   Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
   Map selectPcount(String jurisdiction,String deptid);
   Map selectWPcount(String jurisdiction,String deptid);