Merge branch 'master' of http://172.16.120.112:10080/jichaobo/fiveep

fiveep-persistence/src/main/resources/mapper/mysql/DeviceAnalogVariableListMapper.xml

@@ -28,8 +28,6 @@
         left JOIN device_attribute AS c ON a.monitoring_equipment = c.id
         <where>
             a. STATUS = 1
-            AND b. ENABLE = 1
-            AND c. STATUS = 1
             <if test="siteId != null and siteId !=0">
                 and c.site_id = #{siteId}
             </if>