From ea865027c9e115057644f59747f3bed2a8a963e6 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 23 May 2022 15:15:28 +0800
Subject: [PATCH] Merge branch 'master' into feature/订单服务单代码改造

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
index 15deb13..0ae2601 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java
@@ -15,6 +15,10 @@
 
     public static final String USE_TYPE_ORDRE_CANCEL = "取消订单";
 
+    public static final String USE_TYPE_ORDRE_TK = "订单退款";
+
+    public static final String USE_TYPE_GM = "购买充值卡";
+
     public static final String USE_TYPE_CZ = "会员充值";
 
 	public static final String USE_TYPE_CARD_MODIFY = "会员卡调整";

--
Gitblit v1.9.1