Merge branch 'dev_dz' into dev

zhuo

2025-03-22 687dfeb52ba6bdc3717e72af373ed60506ac48bf

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -250,7 +250,7 @@
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>
        ORDER BY A.ins_time DESC
        ORDER BY send_time asc
    </select>

    <select id="inspectionOrderDetailsTaskSwitching" resultType="com.ruoyi.inspect.vo.InsOrderPlanTaskSwitchVo">