From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java b/src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java
index 7038788..25442ff 100644
--- a/src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java
+++ b/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;
@@ -52,4 +53,9 @@
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
+
+ @ApiModelProperty("启用/禁用")
+ private Boolean isEnabled;
+
+ private UserGrowthRecordDTO userGrowthRecord;
}
--
Gitblit v1.9.3