From 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 12 九月 2024 17:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/constant/Constants.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index eae0d70..bdfa1af 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -529,7 +529,7 @@
}
public enum GROWTH_SOURCE {
- sign("签到"), consume("消费");
+ sign("签到"), consume("消费"), downgrading("降级");
GROWTH_SOURCE(String desc) {
this.desc = desc;
@@ -555,4 +555,20 @@
return desc;
}
}
+ public enum after_sale_type {
+ barters("换货"),
+ returns("退货"),
+ ;
+
+ after_sale_type(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
}
--
Gitblit v1.9.3