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

guoyuji

2024-07-09 d7a52156c1e3d1eb2d85d582ab26133ae2895fa8

 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
        ;