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

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

 basic-server/src/main/resources/mapper/ProductMapper.xml

@@ -35,4 +35,10 @@
                ${ew.customSqlSegment}
            </if>
    </select>

    <select id="getWordQrModel" resultType="java.lang.String">
        SELECT GROUP_CONCAT(DISTINCT isa.model) model
        FROM ins_sample isa
        where isa.ins_order_id = #{orderId}
    </select>
</mapper>