From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java |   21 ++++++++++++++++++---
 1 files changed, 18 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..3153b35 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
@@ -10,9 +10,24 @@
      */
     public final static String FX_MODEL = "FX_MODEL";
     /**
+     * 自购返佣 1:是 2:否
+     */
+    public final static String FX_ZGFY = "FX_ZGFY";
+
+    public final static String FX_ZGFY_YES = "1";
+    public final static String FX_ZGFY_NO = "2";
+    /**
      * 申请方式
      */
     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人工审核
      */
@@ -26,15 +41,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