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

Cui Zhi Feng

2024-09-10 b27420f3e0cbb0de34c34ddd308dd4baf7d4b225

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

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

    @ApiModelProperty(hidden = true)
    private LocalDateTime salesEndDate;

    private String salesType;//售后类型
}