fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/dto/request/partner/UpdatePartnerBaseDTO.java

@@ -11,14 +11,11 @@

    private Long id;

    @ApiModelProperty("用户id")
    private String userId;

    @ApiModelProperty("名称")
    private String name;

    @ApiModelProperty("联系方式")
    private String contactTel;
//    @ApiModelProperty("联系方式")
//    private String contactTel;

    @ApiModelProperty("头像")
    private String cover;