Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 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;


}