Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

puzhibing

4 天以前 f6b68bb83a169418569ec36684015860ff9aee26

 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
@@ -62,4 +63,7 @@

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

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