diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
index 1d1cbd4..5a7ef1d 100644
--- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
+++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/DeviceReportInfo.java
@@ -149,5 +149,9 @@ public class DeviceReportInfo extends BaseEntity
/** 是否自动审核 */
private Boolean autoReview ;
+ /** 设备类型:1.水电双计 2.流量计 */
+ @Excel(name = "设备类型:1.水电双计 2.流量计")
+ @ApiModelProperty("设备类型:1.水电双计 2.流量计")
+ private Integer type;
}
diff --git a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
index ccc8462..1efc7d7 100644
--- a/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
+++ b/fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceReportInfoMapper.xml
@@ -29,10 +29,11 @@
+
- select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time from iot_device_report_info
+ select id, imei, iccid, mcu_id, bsp_type, lte_type, mcu_type, mcu_fw, lte_fw, lcd_manufacturer, voice_manufacturer, fram_model, replace_manufacturer, test_record, batch_number, serial_number, qr_code, name, lcd_manufacturer_name, voice_manufacturer_name, replace_manufacturer_name, device_id, status, powers_time, type from iot_device_report_info
@@ -95,6 +97,7 @@
device_id,
status,
powers_time,
+ type,
#{imei},
@@ -120,6 +123,7 @@
#{deviceId},
#{status},
#{powersTime},
+ #{type},
@@ -149,6 +153,7 @@
device_id = #{deviceId},
status = #{status},
powers_time = #{powersTime},
+ type = #{type},
where id = #{id}