From 5d43370b99a03391c9271d04d3f351f0fd734dae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 18 Mar 2021 20:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java
index 4faf796..de2bc10 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java
@@ -14,6 +14,14 @@
*/
public final static String FX_APPLY_WAY = "FX_APPLY_WAY";
/**
+ * 申请方式 1自动申请通过
+ */
+ public final static String FX_APPLY_WAY_AUTO = "1";
+ /**
+ * 申请方式 2需要主动申请
+ */
+ public final static String FX_APPLY_WAY_CUSTOMER = "2";
+ /**
* 审核方式 1系统自动审核，2人工审核
*/
public final static String FX_AUDIT_METHOD = "FX_AUDIT_METHOD";
@@ -26,15 +34,15 @@
*/
public final static String FX_APPLY_CONDITION_WTJ = "1";
/**
- * 申请条件 1 消费任意产品
+ * 申请条件 2 消费任意产品
*/
public final static String FX_APPLY_CONDITION_XFRYCP = "2";
/**
- * 申请条件 1 消费指定产品
+ * 申请条件 3 消费指定产品
*/
public final static String FX_APPLY_CONDITION_XFZDCP = "3";
/**
- * 申请条件 1 消费指定金额
+ * 申请条件 4 消费指定金额
*/
public final static String FX_APPLY_CONDITION_XCZDJE = "4";
/**
--
Gitblit v1.9.1