Merge remote-tracking branch 'origin/master'

sms_water/src/main/resources/mapper/DeviceMapper.xml

@@ -10,7 +10,6 @@
             ,d.DEVICE_TYPE_ID as "deviceTypeId"
             ,d.COMPANY_ORG_ID as "companyOrgId"
             ,d.DEPT_ORG_ID as "deptOrgId"
-            ,s.SCENE_ID as "sceneId"
             ,d.POINT_X as "pointX"
             ,d.POINT_Y as "pointY"
             ,d.ENABLE_STATE as "enableState"