From b06ac186d84a7cb758314004d1e7328671b3db55 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 02 十一月 2023 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 6f0e30a..c3dd83c 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
@@ -14,8 +14,16 @@
private String deptName;
private String lng;
private String lat;
- private String intoShipment;
+ private String intoShipmentId;
private String intoShipmentTime;
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;
}
--
Gitblit v1.9.3