Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2024-03-22 81df1dcdb77b01b4a957b2b0725f3a91cfc0f72a

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