fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

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

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

    @ApiModelProperty("供应商ID")
    private String supplierId;