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

移动系统liao

2024-07-30 35a617123c0d578772d9f4450bf27d3b52277384

 CoreCms.Net.Configuration/GlobalEnumVars.cs

@@ -206,9 +206,9 @@
            [Description("提现")]
            Tocash = 4,
            /// <summary>
            /// 三级分销佣金
            /// 分销佣金
            /// </summary>
            [Description("三级分销佣金")]
            [Description("分销佣金")]
            Distribution = 5,
            /// <summary>
            /// 平台调整
@@ -246,7 +246,14 @@
            /// 订单
            /// </summary>
            [Description("订单")]
            GoodsOder = 11,
            GoodsOder = 12,


            /// <summary>
            /// 经销配送佣金
            /// </summary>
            [Description("经销配送佣金")]
            DistributionDelivery = 13,
        }
        /// <summary>
        /// 用户积分变动来源类型
@@ -667,10 +674,10 @@
        /// </summary>
        public enum PlanOrderTiJiao
        {
            [Description("未提交")]
            未提交 = 1,
            [Description("已提交")]
            提交 = 2
            [Description("未锁单")]
            未锁单 = 1,
            [Description("已锁单")]
            已锁单 = 2
        }

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

@@ -2860,6 +2872,12 @@
            /// </summary>
            [Description("退货")]
            ReturnedGoods = 5,

            /// <summary>
            /// 铺货盘点
            /// </summary>
            [Description("铺货盘点")]
            CheckPuhuo = 6,
        }

        #endregion