From f07b9f6d18cd85123a01a0c11a76328427b30034 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 23:27:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java b/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
index 5ca6371..94ae5bc 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/MarketDataOut.java
@@ -43,5 +43,11 @@
     //服务器时间
     private String servceTime;
 
+    //自选标记
+    private boolean isMarker = false;
 
+    //过滤数据
+    private String buyAndSell;
+
+    private boolean isFilter = false;
 }

--
Gitblit v1.9.3