Merge remote-tracking branch 'origin/master'

rk

昨天 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 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 ;

}