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

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

 src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java

@@ -67,4 +67,6 @@

    @ApiModelProperty(hidden = true)
    private LocalDateTime salesEndDate;

    private String salesType;//售后类型
}