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

chenlu

3 天以前 b39599abcfce0b8db09fc5c94ff4655a2dc99ee1

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