Merge remote-tracking branch 'origin/master'

doum

昨天 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

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

@@ -51,6 +51,7 @@
    private BigDecimal deductionBalance;


    @ApiModelProperty(hidden = true)
    private Integer memberId ;

}