device

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -437,8 +437,8 @@
       rd.valve_status,
       rd.last_receive_time,
       rd.address,
-      rd.lng,
-      rd.lat,
+      ifnull(rd.lng,rc.lng) as lng,
+      ifnull(rd.lat,rc.lat) as lat,
       rd.user_name,
       rd.user_phone,
       rd.id_card,