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

jinpengyong

2023-08-31 e77cdf62567ba92d2d3131da20429dcbfc3b7ea2

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