From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
index 74a3c76..37443ae 100644
--- a/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
+++ b/screen-api/src/main/java/com/moral/api/entity/HistorySecondUav.java
@@ -1,5 +1,7 @@
 package com.moral.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -23,6 +25,12 @@
     private static final long serialVersionUID = 1L;
 
     /**
+     * ������
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
      * ������mac
      */
     private String mac;

--
Gitblit v1.8.0