From d36bb8b4ea60d1bb0d46bbc0c5dbc02aca86afcd Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 05 六月 2024 08:38:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java index 771204a..b971430 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java @@ -15,7 +15,8 @@ TO_BE_SHIPPED(2, "待发货"), GOODS_TO_BE_RECEIVED(3, "待收货"), FINISHED(4, "已完成"), - CANCELED(5, "已取消"); + CANCELED(5, "已取消"), + AFTER_SALE(6, "售后"); @EnumValue private final int code; -- Gitblit v1.7.1