Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java

@@ -59,4 +59,7 @@

    @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
    private String thisReceiveType;

    @ApiModelProperty(value = "结清标记0未结清1已结清")
    private Integer closeFlag;
}