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

gongzuming

2024-09-10 6d6f3ecc111080094e91fd002e1990dcfa9783e6

 src/main/java/com/mzl/flower/dto/response/payment/OrderItemSalesNewListDTO.java

@@ -96,4 +96,9 @@

    @ApiModelProperty(value = "审核时间")
    private LocalDateTime auditTime;

    @ApiModelProperty(value = "售后类型")
    @DictTrans(target = "salesTypeStr", codeType = "after_sale_type")
    private String salesType;
    private String salesTypeStr;
}