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

# Conflicts:
#	src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java

src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java

@@ -7,6 +7,12 @@ import lombok.Setter;
 
 import java.util.List;
 
+/**
+ * 访问趋势VO
+ *
+ * @author Ray
+ * @since 2.3.0
+ */
 @Schema(description = "访问趋势VO")
 @Getter
 @Setter