添加关键字

mhfire-model/src/main/java/com/bizmatics/mhfire/model/Device.java

@@ -72,7 +72,7 @@ public class Device implements Serializable {
     /**
      * 设备描述
      */
-    private String describe;
+    private String deviceDescribe;
 
     /**
      * 地址信息

mhfire-service/src/main/java/com/bizmatics/mhfire/service/impl/DeviceInfoServiceImpl.java

@@ -24,7 +24,7 @@ public class DeviceInfoServiceImpl extends AbstractCrudService<DeviceInfoMapper,
     @Override
     public List<Map<String, Object>> elIco(String deviceCode, Date startTime, Date endTime) {
         QueryWrapper<DeviceInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("HOUR(lasj) createTime","sum(electric) as elCount")
+        queryWrapper.select("HOUR(create_time) createTime","sum(electric) as elCount")
                 .between("create_time",startTime,endTime)
                 .eq("device_code",deviceCode)
                 .groupBy("createTime");