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

guoyuji

2024-12-17 cfa4a3fdb3dcd9a811157c4bd8f82ba4025917bc

 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);
    }
}