Merge remote-tracking branch 'origin/master'

doum

12 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -77,4 +77,8 @@
    @ApiModelProperty(value = "省市区")
    private Areas areas;

    @ApiModelProperty(value = "可提现余额")
    private BigDecimal amount;


}