From e0ea1f4a21321f145be79556896181f23f22b708 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 09:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

---
 src/main/java/com/mzl/flower/constant/Constants.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index 7834f25..04d154f 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -296,7 +296,9 @@
 
     public enum SETTLEMENT_STATUS {
         PENDING("待结算"),
-        COMPLETED("已结算"),
+        PROCESSING("结算中"),
+        COMPLETED("结算成功"),
+        FAILED("结算失败"),
         ;
 
         SETTLEMENT_STATUS(String desc) {

--
Gitblit v1.9.3