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

cloudroam

2024-11-08 49cff94025cefaf5bdb2db9bdee55b682b9e7390

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

@@ -57,4 +57,11 @@
    private String orderNo;

    private String orderId;

    private Long supplierId;//供应商id

    private String settlementId;

    private String orderItemId;

}