Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-17 7d1dcd74604d8a1b4369cf2f966cc6b628893fc7

 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
        ;