解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 server/system_service/src/main/java/com/doumee/dao/business/model/vo/ValidPhoneCodeVO.java

@@ -29,4 +29,6 @@
    @ApiModelProperty(value = "手机号", example = "1")
    private String phone;

    @ApiModelProperty(value = "openid", example = "1")
    private String openId;
}