Merge remote-tracking branch 'origin/master'

lin

2024-04-13 5497dd57b68dd7ef0ec5844e5f8c0816f7048f25

 src/main/java/org/springblade/common/param/CommonParamSet.java

@@ -92,7 +92,7 @@
               regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), communityCode);
               // 民警角色
               if (!Strings.isBlank(roleName) && roleName.equals("mj")) {
                  regionChildCodesList = SysCache.getPoliceRegionChildCodesByDeptId(AuthUtil.getDeptId(),communityCode);
                  regionChildCodesList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(),communityCode,roleName);
               }
            }
            // 获取网格编号集合