From 824edc826c92312c150a2f0eea9bdd2bfcb82b2f Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 14:28:37 +0800
Subject: [PATCH] 冲突
---
src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
index 9f377eb..084fad1 100644
--- a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
@@ -37,6 +37,4 @@
@ApiModelProperty("未消费产生的下降值")
private int downgradeValue;
- @ApiModelProperty("成长值规则")
- private String growthRule;
}
--
Gitblit v1.9.3