From 9ac162353268b6dec8563d9a20ca881290ba1e63 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 7 ++++---
1 files changed, 4 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..bb14e25 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,10 @@
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;
}
--
Gitblit v1.9.3