Merge remote-tracking branch 'origin/master'

rk

9 小时以前 cc4c386f1883667651321bb0fc7b57c71b6d0dc4

 server/services/src/main/java/com/doumee/dao/business/model/ShopInfo.java

@@ -156,6 +156,12 @@
    @ApiModelProperty(value = "配送范围(km)")
    private BigDecimal deliveryArea;

    @ApiModelProperty(value = "当前余额(分)")
    private Long balance;

    @ApiModelProperty(value = "历史总金额(分)")
    private Long totalBalance;

    @ApiModelProperty(value = "支付宝提现账户")
    private String aliAccount;