Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

 screen-api/src/main/java/com/moral/api/service/MenuService.java

@@ -1,5 +1,6 @@
package com.moral.api.service;

import java.util.List;
import java.util.Map;

import com.moral.api.entity.Menu;
@@ -16,4 +17,6 @@
public interface MenuService extends IService<Menu> {

    Map<String,Object> selectMenusByOrgId(Integer orgId);

    List<Menu> getMenuList(Integer orgId);
}