From 3022fdb1f9828f441a18bf61fd965375ae5a5ca7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 10 十二月 2025 17:52:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index c5b8b7b..4b0873a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -550,7 +550,7 @@
*/
public enum OrderStatus{
WAIT_PAY(0, "寰呮敮浠�", "寰呮敮浠�"),
- PAY_DONE(1, "寰呭彂璐�", "宸叉敮浠樹唬鍙戣揣"),
+ PAY_DONE(1, "寰呭彂璐�", "宸叉敮浠樺緟鍙戣揣"),
WAIT_RECEIVE(2, "寰呮敹璐�", "宸插彂璐у緟鏀惰揣"),
DONE(3, "浜ゆ槗瀹屾垚", "浜ゆ槗瀹屾垚"),
CLOSE(4, "宸插叧闂�", "宸插叧闂�"),
@@ -914,7 +914,8 @@
DARENTANDIANTYPE(11, "杈句汉鎺㈠簵鍒嗙被", "杈句汉鎺㈠簵鍒嗙被"),
HOMEZHUANQU(12, "棣栭〉涓撳尯", "棣栭〉涓撳尯"),
BIG_AREA(13, "鍖哄煙鍒嗙被", "鍖哄煙鍒嗙被"),
-
+ APPLICABLE_BRAND(14, "閫傜敤鍝佺墝", "閫傜敤鍝佺墝"),
+ SERIES_BRAND(15, "绯诲垪鍝佺墝", "绯诲垪鍝佺墝"),
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3