From b1f91d23c01266dda8cad34aa866bcac741a21cf Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 17:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
index c16c13e..15928f9 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@@ -14,9 +15,19 @@
private String deptName;
private String lng;
private String lat;
- private String time;
- private String intoShipment;
+ private String intoShipmentId;
private String intoShipmentTime;
- private String intoUnload;
+ private String intoUnloadId;
private String intoUnloadTime;
+ private String outShipmentId;
+ private String outShipmentTime;
+ private String lastTime;
+ private Integer isWarning;
+ private String nowWallName;
+ private String alarmLng;
+ private String alarmLat;
+ private String carModel;
+ private Integer drct;
+ @TableField(value = "is_alarm")
+ private Integer isAlarm;
}
--
Gitblit v1.9.3