From 8d8eb4d274f45441da01b6315549ddd0069fc8f1 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 10 Jul 2025 08:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java   | 2 +-
 .../main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java    | 2 +-
 .../njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 781a6da..978dde5 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -438,7 +438,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 addDataSet(dataSetList, item, "历史统计数据", "history");
                 addDataSet(dataSetList, item, "历史趋势", "trenddata");
                 if (item.getClDev() == 0 && item.getType() == 0) {
-                    addDataSet(dataSetList, item, "模块运行状态", "moduleData");
+                    addDataSet(dataSetList, item, "模块数据", "moduleData");
                 }
                 if (isPortableDevice) {
                     // 便携式设备特有的数据集
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
index ac2d49c..32d25c5 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
@@ -117,7 +117,7 @@ public class EventDetailVO {
     private String systemType="ZL";
 
     @ApiModelProperty("子模块编号")
-    private String modelNo;
+    private String moduleNo;
 
 
     @ApiModelProperty("逻辑子设备编码")
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index da62c03..7d05142 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -423,7 +423,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             temp.setShowName(ele.getShowName());
             temp.setCode(ele.getDefaultValue());
             if (temp.getLineId().endsWith("0")) {
-                temp.setModelNo("模块" + temp.getClDid());
+                temp.setModuleNo("模块" + temp.getClDid());
             }
             if(Objects.equals(csEventUserQueryPage.getType(),"0")){