From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 5 ++++-
1 files changed, 4 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 4615aa5..a87e44b 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
@@ -21,8 +21,11 @@
private String outShipmentId;
private String outShipmentTime;
private String lastTime;
- private String isWarning;
+ private Integer isWarning;
private String nowWallName;
private String alarmLng;
private String alarmLat;
+ private String carModel;
+ private String drct;
+ private Integer isAlarm;
}
--
Gitblit v1.9.3