From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java | 9 ++++-----
1 files changed, 4 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..977b12b 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,10 @@
/* 订单来源 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, "拍卖");
@EnumValue
private final int code;
@JsonValue
--
Gitblit v1.7.1