Merge remote-tracking branch 'origin/master'

doum

昨天 d0da0ce546110de49cca9e0358029a51c53188d6

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/ShopLoginDTO.java

@@ -8,8 +8,8 @@
@ApiModel("经销商登录请求对象")
public class ShopLoginDTO {

    @ApiModelProperty(value = "关联用户主键")
    private Integer memberId;
//    @ApiModelProperty(value = "关联用户主键")
//    private Integer memberId;

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