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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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