Merge remote-tracking branch 'origin/master'

doum

12 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/WxPhoneRequest.java

@@ -40,6 +40,8 @@


    @ApiModelProperty(value = "邀请码")
    private String recId;
    private Integer recId;

    @ApiModelProperty(value = "商户主键")
    private Integer shopId;
}