From e097b03e9032a8e884c36e6a28d8b5002780daeb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java
index 763b56d..048b837 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java
@@ -12,11 +12,11 @@
/* 订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单*/
- COMMODITY_ORDER(1, "商品订单"),
- SNAP_ORDERS(2, "秒杀订单"),
- GROUP_PURCHASE_ORDERS(3, "团购订单"),
- BOND(4, "保证金"),
- AUCTION_ORDERS(5, "拍卖订单");
+ COMMODITY_ORDER(1, "商品"),
+ SNAP_ORDERS(2, "秒杀"),
+ GROUP_PURCHASE_ORDERS(3, "团购"),
+ AUCTION_ORDERS(4, "拍卖"),
+ WISH_ORDER(5, "心愿求购");
@EnumValue
private final int code;
@JsonValue
--
Gitblit v1.7.1