Merge remote-tracking branch 'origin/master'

doum

21 小时以前 a76e2318dd2731ff713df6e262396a9175d029f7

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

@@ -20,11 +20,15 @@
    @ApiModelProperty(value = "用户token")
    private String token;

    @ApiModelProperty(value = "微信sessionKey")
    private String sessionKey;

    @ApiModelProperty(value = "用户信息")
    private Member member;

    @ApiModelProperty(value = "用户openid")
    private String openid;

    @ApiModelProperty(value = "经销商信息")
    private ShopInfoResponse shop;



}