增加websocket,增加定时任务管理

2021-01-14 16:59:21 +08:00
parent 4fa8dcc07a
commit 4152e237c3
1 changed files with 1 additions and 4 deletions
--- a/falsework-client/src/test/java/TableViewSample.java
+++ b/falsework-client/src/test/java/TableViewSample.java
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-import com.fx.server.vo.UserVO;
-=======
->>>>>>> 6fa352c50bee89ed3f768a2360e651f447f94c96
+
 import javafx.application.Application;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ListProperty;