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 | 3 ++-
1 files changed, 2 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..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
@@ -21,8 +21,9 @@
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;
}
--
Gitblit v1.9.3