fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/dto/request/menber/MemberRecordQueryDTO.java

@@ -15,4 +15,6 @@
    private Date startRecordDate;
    @ApiModelProperty(value = "记录结束日期")
    private Date endRecordDate;
    @ApiModelProperty("用户ID")
    private String userId;
}