Merge branch 'xin' into pxb

彭雪彬

2025-07-17 b919b454bccc18d67b7109a09357499d09211eac

 oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml

@@ -143,7 +143,11 @@
        <include refid="Base_Column_List"/>
        from sh_order_return as o
        <include refid="Where_sql"/>
        order by o.return_id desc ) o
        order by o.return_id desc
        <if test="criteria.offset != null">
            limit #{criteria.offset}, #{criteria.size}
        </if>
        ) o
        left join sh_order_return_product_snapshot as p on p.return_num = o.return_num
        <include refid="Where_Sql_Product"/>
        order by o.order_id desc