From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期一, 09 十二月 2024 11:52:07 +0800 Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5 --- src/main/java/com/mzl/flower/dto/response/customer/CustomerDTO.java | 8 ++++++++ 1 files changed, 8 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..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; @@ -52,4 +53,11 @@ @ApiModelProperty("更新时间") private LocalDateTime updateTime; + + @ApiModelProperty("启用/禁用") + private Boolean isEnabled; + + private UserGrowthRecordDTO userGrowthRecord; + + private Integer orderNum; } -- Gitblit v1.9.3