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

guoyuji

2024-03-19 c41c3317eeb54a3e96ab50669cb7ed51c25b35c5

 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
        ;