Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -151,7 +151,9 @@
    */
   List<Map<String, Object>> getWorkReportInfo(@Param("type")String type,
                                    @Param("deptid")String deptid,
                                    @Param("jurisdiction")String jurisdiction);   /**
                                    @Param("jurisdiction")String jurisdiction);

   /**
    * 工作汇报人员(向民警)
    * @param deptid
    * @param jurisdiction