Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-09 827cda96e65856b3b83c2a9b0fe418bd7ec48e94

 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>