From 2083e3fee3cd0ef1b9f011c22497ad750ac2df2b Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 22 Jan 2024 14:20:44 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/FrontierProtectionNoNetData.java      | 16 ++++++++++------
 .../xml/FrontierProtectionNoNetDataMapper.xml    |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java
index 23d5405f6..9476ad660 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/entity/FrontierProtectionNoNetData.java
@@ -125,10 +125,14 @@ public class FrontierProtectionNoNetData implements Serializable {
 	@ApiModelProperty(value = "操作时间")
 	private java.util.Date operateTime;
 
-    @TableField(exist = false)
-    @ApiModelProperty(value = "设备名称")
-    private java.lang.String devName;
-    @TableField(exist = false)
-    @ApiModelProperty(value = "设备位置")
-    private java.lang.String location;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "设备名称")
+	private java.lang.String devName;
+	@TableField(exist = false)
+	@ApiModelProperty(value = "设备位置")
+	private java.lang.String location;
+
+	@TableField(exist = false)
+	@ApiModelProperty(value = "操作人")
+	private java.lang.String operateName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml
index 991543cc3..4e8c757c4 100644
--- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDataMapper">
     <select id="queryList"
             resultType="com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData">
-        select fpnnd.*,fpd.location,fpd.dev_name from frontier_protection_no_net_data fpnnd
+        select fpnnd.*,fpd.location,fpd.dev_name,su.real_name operateName from frontier_protection_no_net_data fpnnd
         join frontier_protection_dev fpd on fpd.dev_sn=fpnnd.dev_sn
         left join system_user su on su.user_id=fpnnd.operate_id
         ${ew.customSqlSegment}