Merge remote-tracking branch 'origin/master'

doum

昨天 11e35e0257e48667292b4f563ddf6ce02a3a22bb

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java

@@ -122,6 +122,9 @@
    @ApiModelProperty(value = "支付单号", example = "1")
    private String payOrderId;

    @ApiModelProperty(value = "支付方式 0微信支付 1线下支付", example = "1")
    private Integer payMethod;

    @ApiModelProperty(value = "快递单号", example = "1")
    private String kdCode;