Merge remote-tracking branch 'origin/master'

doum

13 小时以前 0982a97b0c65e11034b9d6b00cc0e4aba39254be

 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 ;

}