Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-28 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6

 standard-server/src/main/resources/mapper/DeviceMapper.xml

@@ -61,5 +61,12 @@
        from mom_ocean.device
        where state=1
        and father=#{deviceGroup}
          and device_status in (1, 5)
    </select>
    <!--选择设备组-->
    <select id="chooseDevGroup" resultType="java.util.Map">
        select distinct father
        from mom_ocean.device
        where state=1 and device_status in(1,5)
    </select>
</mapper>