Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-28 a809880caeba9911326861881acb29d34c533069

 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml

@@ -215,11 +215,11 @@
    <select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
        SELECT
               wo.id as workOrderId,
               di.device_id,
               di.channel_id
               wo.serial_number as deviceId
        FROM
             t_work_order wo
                 INNER JOIN t_device_info di ON wo.serial_number = di.device_id
        WHERE
            deleted = 0
    </select>

    <insert id="addMany">