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

cjl

2023-08-18 239927b057f65a040594f7a4cb08c8881b303797

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