Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 8a98f5894beb29d3c5039e8c2505fe33bce6ecf7

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java

@@ -106,6 +106,7 @@
      }else{
         wrapper.isNull(SysRole::getShopId);
      }
      wrapper.ne(SysRole::getRoleId,2);//过滤门店管理员
      PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
      for (SysRole record : page.getRecords()) {
         long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));