fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

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

@@ -29,6 +29,9 @@
    @ApiModelProperty("订单金额")
    private BigDecimal orderTotal;

    @ApiModelProperty("订单金额(实付)")
    private BigDecimal totalAmount;

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