From c20f2f0056da7e35548d3e424e9caff719244e78 Mon Sep 17 00:00:00 2001
From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com>
Date: Sat, 1 Nov 2025 17:15:44 +0800
Subject: [PATCH] =?UTF-8?q?11.1=20=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E7=9A=84=E9=87=87=E9=9B=86=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/alops/system/domain/EquInterface.java | 2 --
.../src/main/resources/mapper/system/EquInterfaceMapper.xml | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
index 85619033..d727d0df 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
@@ -29,8 +29,6 @@ public class EquInterface
private String equId;
/** 采集时间 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date gatherTime;
/** 端口运行与否(UP/DOWN(true/false)) */
diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
index 97c0918e..050c9063 100644
--- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
+++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select i.id, g.equ_id, i.gather_time, running, rate, commuicate_mode, out_flow, in_flow, in_bandwidth, loss_rate, error_rate, equ_gather_id, interface_id, out_bandwidth from equ_interface i LEFT JOIN equ_gather g ON i.equ_gather_id = g.id
+ select i.id, g.equ_id, g.gather_time, running, rate, commuicate_mode, out_flow, in_flow, in_bandwidth, loss_rate, error_rate, equ_gather_id, interface_id, out_bandwidth from equ_interface i LEFT JOIN equ_gather g ON i.equ_gather_id = g.id