diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
index 900c64c..fdd467e 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/EnergyTemplateVO.java
@@ -28,6 +28,9 @@ public class EnergyTemplateVO {
     @ApiModelProperty("指标名称")
     private String name;
 
+    @ApiModelProperty("单位")
+    private String unit;
+
     @ApiModelProperty("数据类型")
     private String statMethod;
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index ad565c1..c294dab 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -89,6 +89,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 BeanUtils.copyProperties(item,vo);
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
                 vo.setClassId(eleEpdPqd.getClassId());
+                vo.setUnit(eleEpdPqd.getUnit());
                 StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,eleEpdPqd.getClassId(),item.getName(),item.getPhase(),item.getStatMethod());
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setTime(statisticalDataDTO.getTime());
@@ -131,6 +132,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                 BeanUtils.copyProperties(item,vo);
                 EleEpdPqd eleEpdPqd = epdFeignClient.selectById(item.getDataId()).getData();
                 vo.setClassId(eleEpdPqd.getClassId());
+                vo.setUnit(eleEpdPqd.getUnit());
                 StatisticalDataDTO statisticalDataDTO = commonService.getLineHistoryData(energyBaseParam.getLineId(),eleEpdPqd.getClassId(),item.getName(),energyBaseParam.getStartTime(),energyBaseParam.getEndTime());
                 if (!Objects.isNull(statisticalDataDTO)){
                     vo.setMaxValue(BigDecimal.valueOf(statisticalDataDTO.getMaxValue()).setScale(4, RoundingMode.UP).doubleValue());