Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 03166fec064856cb14de837cedc8bb6c5a537212

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

@@ -21,6 +21,7 @@
        <result property="pictureImg"    column="picture_img"    />
        <result property="labelId"    column="label_id"    />
        <result property="background"    column="background"    />
        <result property="labelStr"    column="label_str"    />
    </resultMap>

    <resultMap id="menuVOResultMap" type="org.springblade.modules.system.vo.MenuVO">
@@ -66,7 +67,8 @@
            is_deleted,
            picture_img,
            label_id,
            background
            background,
            label_str
        from
            blade_menu
    </sql>
@@ -135,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">