From 57a283d06cba1fd3a6b78af590a97372774bbca6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 15:45:03 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java |    5 +++++
 1 files changed, 5 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 e32f68f..d601a6b 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;
 
@@ -55,4 +56,8 @@
 
     @ApiModelProperty("启用/禁用")
     private Boolean isEnabled;
+
+    private UserGrowthRecordDTO userGrowthRecord;
+
+    private Integer orderNum;
 }

--
Gitblit v1.9.3