Merge remote-tracking branch 'origin/master'

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

@@ -49,7 +49,7 @@
      </sql>
     <sql id="leftJoins">
           LEFT JOIN sms_device b on a.DEVICE_ID=b.ID
-          left join sms_device_parm d on d.DEVICE_ID=a.DEVICE_ID and d.ATTRIBUTE_ID = a.ATTRIBUTE_ID and  d.`STATUS`=1
+          left join sms_device_parm d on a.SCENE_ID=d.SCENE_ID and d.DEVICE_ID=a.DEVICE_ID and d.ATTRIBUTE_ID = a.ATTRIBUTE_ID and  d.`STATUS`=1
     </sql>
     <!--  根据主键获取实体   -->
     <select id="findMonitorInfoById" resultType="com.huaxu.entity.MonitorInfoEntity">