Merge remote-tracking branch 'origin/6-29' into 6-29

zyy

2025-06-25 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47

 src/main/resources/mapper/OrderEchoMapper.xml

@@ -35,7 +35,7 @@
        from order_echo  o
                 join echo e
                      on o.eid = e.id
        where user_id = #{id}
        where user_id = #{id} GROUP BY o.buy_time desc
    </select>

    <select id="queryAll" resultType="com.nq.pojo.reponse.OrderEChoReponse">