Merge branch 'four_member' into test

101captain

2021-09-26 8be4769bf80c5e28152875a1428e39a9d369e18c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserPhoneVO.java

@@ -20,6 +20,6 @@
    private String newPhone;
    @ApiModelProperty("短信验证码")
    private String smsCode;
    @ApiModelProperty(value = "当前登录用户id",hidden = true)
    @ApiModelProperty(value = "当前登录用户id", hidden = true)
    private Long userId;
}