Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-06-05 af954d6dd06411cd9540520c59dd71dea4eff6e1

 north-glass-erp/src/main/resources/mapper/userInfo/SysMenuItem.xml

@@ -9,6 +9,7 @@
        from `sys_menu_item` as a
        where
            a.state=1
           and a.languageType = #{lang}
        order by
            a.menuId,a.listSort
        ;