Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

 screen-api/src/main/java/com/moral/api/mapper/MenuMapper.java

@@ -1,5 +1,7 @@
package com.moral.api.mapper;

import java.util.List;

import com.moral.api.entity.Menu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

@@ -13,4 +15,7 @@
 */
public interface MenuMapper extends BaseMapper<Menu> {

    List<Menu> selectUserMenu(Integer userId);

    List<Menu> selectOrganizationMenu(Integer orgId);
}