fix: 冲突

cloudroam

2024-10-23 8c469898c0a71224e17780696d47581de47c9ed7

 src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java

@@ -1,5 +1,6 @@
package com.mzl.flower.dto.response.customer;

import com.mzl.flower.dto.request.menber.UserGrowthRecordDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -55,4 +56,6 @@

    @ApiModelProperty("启用/禁用")
    private Boolean isEnabled;

    private UserGrowthRecordDTO userGrowthRecord;
}