Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

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

@@ -6,6 +6,7 @@

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * @author jqs34
@@ -59,4 +60,10 @@

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

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

    @ApiModelProperty("商品明细")
    private List<AppGoodsInfoVo> goodsList;
}