Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-31 06650302163e395c038b37a10d5c4214ba9cc8a9

 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;
}