From 511224e9475365d1158743442c1b997c7db67979 Mon Sep 17 00:00:00 2001
From: wangyinsheng <2310589501@qq.com>
Date: Mon, 23 Sep 2024 17:10:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java    | 4 ++--
 .../hnac/gglm/bigmodel/maintenance/service/DataInstructService.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
index c60ee79..44cc106 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/dto/DeviceFuncDTO.java
@@ -22,7 +22,7 @@ public class DeviceFuncDTO {
     @ApiModelProperty("遥控的设备ID")
     private String deviceId;
 
-    @ApiModelProperty("用于展示和匹配的全称，一般可设为 站点名称-遥控名称")
-    private String itemName;
+    @ApiModelProperty("遥控名称")
+    private String ykName;
 
 }
diff --git a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
index e137678..f8e0600 100644
--- a/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
+++ b/hzims-service/gglm-big-model/src/main/java/com/hnac/gglm/bigmodel/maintenance/service/DataInstructService.java
@@ -61,7 +61,7 @@ public class DataInstructService extends BaseServiceImpl<DataInstructMapper, Dat
                 deviceFuncDTO.setDeviceId(deviceFunc.getDeviceId());
                 deviceFuncDTO.setDeviceName(deviceFunc.getDeviceName());
                 deviceFuncDTO.setItemId(deviceFunc.getSignage());
-                deviceFuncDTO.setItemName(deviceFunc.getItemName());
+                deviceFuncDTO.setYkName(deviceFunc.getName());
                 deviceFuncDTO.setStationName(deviceFunc.getProjectName());
                 deviceFuncDTO.setStationId(deviceFunc.getProjectId());
                 deviceFuncDTOS.add(deviceFuncDTO);