Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 03166fec064856cb14de837cedc8bb6c5a537212

 src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -137,7 +137,7 @@
    </select>

    <select id="allMenu" resultMap="menuResultMap">
        select * from blade_menu where is_deleted = 0 and category = 1
        select * from blade_menu where is_deleted = 0 and category = 1 and name != 'app'
    </select>

    <select id="roleMenu" resultMap="menuResultMap">