fix: 冲突

cloudroam

2024-10-23 d7819bb819cd897d5933ac98bdec7e3ccc70846c

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

@@ -55,4 +55,6 @@

    @ApiModelProperty(value = "订单号")
    private String orderNo;

    private String orderId;
}