Merge remote-tracking branch 'origin/master'

doum

12 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

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

@@ -35,6 +35,6 @@
    private String openid;

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

}