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

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