Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-05-29 7a3a4f8012a72f80d8dd62064a76655c803da864

 CoreCms.Net.Configuration/GlobalEnumVars.cs

@@ -206,9 +206,9 @@
            [Description("提现")]
            Tocash = 4,
            /// <summary>
            /// 三级分销佣金
            /// 分销佣金
            /// </summary>
            [Description("三级分销佣金")]
            [Description("分销佣金")]
            Distribution = 5,
            /// <summary>
            /// 平台调整
@@ -667,10 +667,10 @@
        /// </summary>
        public enum PlanOrderTiJiao
        {
            [Description("未提交")]
            未提交 = 1,
            [Description("已提交")]
            提交 = 2
            [Description("未锁单")]
            未锁单 = 1,
            [Description("已锁单")]
            已锁单 = 2
        }

        /// <summary>
@@ -1025,7 +1025,12 @@
            /// 余额支付
            /// </summary>
            [Description("余额支付")]
            balancepay = 4
            balancepay = 4,
            /// <summary>
            /// 计划订单支付
            /// </summary>
            [Description("计划订单支付")]
            planorderpay = 5
        }
        #endregion