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

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

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

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

    @ApiModelProperty(hidden = true)
    private LocalDateTime salesEndDate;

    private String salesType;//售后类型
}