解决文件冲突代码

2023-05-16 10:23:07 +08:00
parent 708af80624
commit 7ee067191f
6 changed files with 77 additions and 17 deletions
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java
@@ -20,9 +20,6 @@ public class Communicate {

    private static final long serialVersionUID = 1L;

-    /**
-     * 终端Id
-     */
    /**
     * 更新时间
     */
@@ -33,7 +30,11 @@ public class Communicate {
     */
    @Column(name = "line_id")
    private String id;
-
+    /**
+     * 终端Id
+     */
+    @Column(name = "dev_id")
+    private String devId;

    /**
     * 事件类型(0：中断；1：正常；2：退出)