Merge remote-tracking branch 'origin/dev' into dev

bluejay

2025-04-09 06d2730553811243101503b96620407d68008f54

 aps-modules/aps-core/src/main/resources/mapper/core/ApsWeldSeamMapper.xml

@@ -62,7 +62,10 @@
        <include refid="selectApsWeldSeamVo"/>
        where id = #{id}
    </select>

    <select id="selectApsWeldSeamByWorkOrderNo" parameterType="String" resultMap="ApsWeldSeamResult">
        <include refid="selectApsWeldSeamVo"/>
        where work_order_no = #{workOrderNo}
    </select>
    <insert id="insertApsWeldSeam" parameterType="ApsWeldSeam">
        insert into aps_weld_seam
        <trim prefix="(" suffix=")" suffixOverrides=",">