Merge remote-tracking branch 'origin/master'

liusheng

2025-06-03 11bc9c5453ef32df0be2c3d9c549b04910b8fbca

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -79,7 +79,7 @@
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
        order by d.parent_id, d.order_num
        order by d.dept_type asc, d.parent_id, d.order_num
    </select>

    <select id="selectDeptListByRoleId" resultType="Long">