Merge branch 'master' into test

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -638,9 +638,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId).collect(Collectors.toList());
 
             //统计条件：当天
-            String day = SysDictUtils.getValue(EnumDeviceDataType.Code.CODE.getCode(), EnumDeviceDataType.DAY.getCode(), String.class);
             DeviceDataDto.ListDTO deviceDataListDTO = new DeviceDataDto.ListDTO()
-                    .setDeviceIds(deviceIds).setType(day).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
+                    .setDeviceIds(deviceIds).setType(EnumDeviceDataType.DAY.getCode()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
 
             List<DeviceDataDto.Vo> deviceDataList = deviceDataService.list(deviceDataListDTO);
             Map<Long, DeviceDataDto.Vo> dataMap = new HashMap<>();