Merge branch 'dev_cr' into dev

chenrui

2025-03-11 379222715511cc4d6efd4abbbb3463f5485f590d

 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>