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

guoyuji

2024-07-17 b17507f4960c8544bae4d5e3d235b239bca1dc9f

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/SysMenuService.java

@@ -14,8 +14,8 @@
    @Autowired
    private SysMenuMapper sysMenuMapper;

    public List<SysMenu> getMenu(){
    public List<SysMenu> getMenu(String lang){

        return sysMenuMapper.findAll();
        return sysMenuMapper.findAll(lang);
    }
}