Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-10-19 2a4a9ef52b0d76efb9712fd8d4268f658546f99f

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

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

    List<Menu> selectUserMenu(int userId);
    List<Menu> selectUserMenu(Integer userId);

    List<Menu> selectOrganizationMenu(Integer orgId);
}