Merge remote-tracking branch 'origin/master'

doum

4 天以前 c51de64d5ee334d914c90f5e4f82a13f159492ca

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

@@ -165,6 +165,9 @@
    @ApiModelProperty(value = "支付宝提现账户")
    private String aliAccount;

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

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