From 305fe6a8621998e5130d541660c2e3c5f02672d6 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期一, 30 十月 2023 09:27:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 4 +++- 1 files changed, 3 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 6f0e30a..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,8 +14,10 @@ private String deptName; private String lng; private String lat; - private String intoShipment; + private String intoShipmentId; private String intoShipmentTime; private String intoUnloadId; private String intoUnloadTime; + private String outShipmentId; + private String outShipmentTime; } -- Gitblit v1.9.3