Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-10-12 021fcaca65cc87874e216630153e17455acaabce

 src/main/resources/mapper/report/OrderReportMapper.xml

@@ -496,7 +496,7 @@
            and o.payment_time <= #{dto.endDate}
        </if>
        <if test="dto.supplierId != null">
            and oi.supplierId = #{dto.supplierId}
            and oi.supplier_id = #{dto.supplierId}
        </if>
        ) t1
        GROUP BY