From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 14 +++++++++++---
1 files changed, 11 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..bff2667 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,9 +14,17 @@
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 String drct;
}
--
Gitblit v1.9.3