Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-27 6712b6d4d3bd39713d387fead75b7d65f8d157c2

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

@@ -13,6 +13,7 @@
                    <result column="create_time" property="createTime" />
                    <result column="update_time" property="updateTime" />
                    <result column="is_delete" property="isDelete" />
                    <result column="desc" property="desc" />
        </resultMap>

</mapper>