Merge remote-tracking branch 'origin/master'

mitao

2024-06-19 d4f159d60acf6f263bfa4508a113c0feacd2f5b9

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/MemberInvoiceOrder.java

@@ -44,7 +44,7 @@
    private BigDecimal orderMoney;

    @ApiModelProperty(value = "订单id")
    private Integer orderId;
    private Long orderId;


}