Merge remote-tracking branch 'origin/master'

doum

2 天以前 c29a4c8f6022e6cd5ff92d499c8db829c8c471aa

 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 ;

}