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

guoyuji

2024-07-05 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f

 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
        ;