From 0306d5836a7a56614e01af35b9e70f0224b47cb2 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 13:51:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 2f25e20..0f6e348 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
@@ -20,6 +20,12 @@
private String intoUnloadTime;
private String outShipmentId;
private String outShipmentTime;
- private String isWarning;
- private String isDel;
+ private String lastTime;
+ private Integer isWarning;
+ private String nowWallName;
+ private String alarmLng;
+ private String alarmLat;
+ private String carModel;
+ private Integer drct;
+ private Integer isAlarm;
}
--
Gitblit v1.9.3