Merge branch 'dev-mitao'

mitao

2024-05-23 79e1fa7c5b198d16f43832bb5896b5072f3e5f11

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java

@@ -54,13 +54,7 @@

    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "会员姓名")
    private String memberName;

    @ApiModelProperty(value = "联系方式")
    private String phoneNumber;

    
    @ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
    private PaymentMethodEnum paymentMethod;