Merge remote-tracking branch 'origin/master'

doum

3 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java

@@ -23,7 +23,7 @@
    @ApiModelProperty(value = "订单类型 0平台商城 1咖豆商城", example = "1")
    private Integer orderType;

    @ApiModelProperty(value = "状态 0待支付 1待发货 2待收货 3交易完成", example = "1")
    @ApiModelProperty(value = "状态 0待支付 1待发货/自提 2待收货 3交易完成", example = "1")
    private Integer orderStatus;

}