Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-13 3c6e6da7d37b174edd9e94301030f96ff726ad74

 cnas-server/src/main/resources/mapper/DepartmentMapper.xml

@@ -18,4 +18,7 @@
        WHERE id = #{id}
        ORDER BY id
    </select>
    <select id="selectCustomList" resultType="com.yuanchu.mom.dto.DepartmentDto">
        select id, name, category fatherId from role;
    </select>
</mapper>