fix: 冲突

cloudroam

2024-10-23 d7819bb819cd897d5933ac98bdec7e3ccc70846c

 src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java

@@ -13,12 +13,15 @@

    @ApiModelProperty("下单日期")
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private LocalDateTime orderDate;

    @ApiModelProperty("销售额")
    private BigDecimal orderTotal;

    @ApiModelProperty("销售合计（实付）")
    private BigDecimal totalAmount;

    @ApiModelProperty("花农底价")
    private BigDecimal orderSupplierPriceAmount;