Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml

@@ -165,4 +165,21 @@
        where id = #{id}
    </update>

    <select id="getDataWithPage" parameterType="java.util.Map" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"></include>
        from manage_menu mm
        where mm.is_delete = 0
        limit #{start},#{number}
    </select>

    <select id="getManageRoleByNameFuzzy" parameterType="java.util.Map" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"></include>
        from manage_menu mm
        where mm.name like concat('%',#{name},'%')
        and mm.is_delete = 0
        limit #{start},#{number}
    </select>

</mapper>