Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

# Conflicts:
#	sql/mysql5/youlai_boot.sql
#	src/main/java/com/youlai/boot/module/websocket/service/MessageService.java
#	src/main/java/com/youlai/boot/module/websocket/service/WebsocketService.java
#	src/main/java/com/youlai/boot/module/websocket/service/impl/WebsocketServiceImpl.java
#	src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java

src/main/java/com/youlai/boot/system/model/query/MenuQuery.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @author haoxr
  * @since 2022/10/28
  */
-@Schema(description ="部门分页查询对象")
+@Schema(description ="菜单查询对象")
 @Data
 public class MenuQuery {