Merge remote-tracking branch 'origin/master'

rk

昨天 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 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;

}