From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期二, 08 十月 2024 17:13:27 +0800 Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3 --- src/main/java/com/mzl/flower/constant/Constants.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java index bdfa1af..fc79067 100644 --- a/src/main/java/com/mzl/flower/constant/Constants.java +++ b/src/main/java/com/mzl/flower/constant/Constants.java @@ -482,6 +482,7 @@ consume("消费获取"), activity("活动获取"), giveaway("积分赠送"), + sign("签到"), deduction("积分扣减"), exchange("积分兑换"), expired("积分过期"); @@ -556,8 +557,11 @@ } } public enum after_sale_type { - barters("换货"), - returns("退货"), + quality("1.质量问题"), + stockout("2.缺货问题"), + broken("3.断头问题"), + category("4.品类不符"), + grade("5.等级不符"), ; after_sale_type(String desc) { -- Gitblit v1.9.3