Merge remote-tracking branch 'origin/master'

doum

3 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

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

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

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

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

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

    @ApiModelProperty(value = "支付宝实名姓名")
    private String aliName;

    @ApiModelProperty(value = "营业时间")
    private String shopHours;