Merge remote-tracking branch 'origin/dev' into dev

peng

6 天以前 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85

 framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java

@@ -72,7 +72,7 @@
    @ApiModelProperty(value = "会员头像")
    private String face;

    @ApiModelProperty(value = "会员状态")
    @ApiModelProperty(value = "会员状态：true 表示没被禁用， false 被禁用")
    private Boolean disabled;

    @ApiModelProperty(value = "是否开通店铺")