Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1

mitao

2025-03-11 2e1a9c064309e60047473c78f0dd3a88c726bb8d

 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;


}