From 10215da99ee763cf72897c747f82efd4f9a513ad Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 20:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
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