Merge branch '20200908' into 20201014

smart-city-platform/src/main/resources/mapper/DeviceMapper.xml

@@ -1129,7 +1129,7 @@
         sd.status,
         sd.date_create,
         sd.date_update,
-        sil.new_meter_start,
+        sil.new_meter_start as initial_data,
         CONCAT_WS('/',sdm.name,sdt.equipment_type,sdt.model) as device_type
         from sc_device sd
         left join sc_install_list sil on(sil.device_id = sd.id)