Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-04 6db5272e2df8a27942f10c03d93183fc9b01e22a

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

@@ -48,6 +48,14 @@
        where state = 1
          and device_status in (1, 5)
    </select>

    <!--原材料检验-选择设备-->
    <select id="chooseDevice" resultType="java.util.Map">
        select id, name
        from mom_ocean.device
        where state = 1
          and device_status in (1, 5)
    </select>
    <!--批量删除-->
    <update id="delAllDevice">
        update mom_ocean.device