Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-10-15 ba1585de34dc3486cc915936489461c0acaf06ad

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -202,7 +202,7 @@
     * @return 结果
     */
    @Override
    public int countUserRoleByRoleId(Long roleId) {
    public long countUserRoleByRoleId(Long roleId) {
        return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
    }