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

移动系统liao

2024-06-25 1428284ade391f33c6fea64d87b2366af5c50aee

 CoreCms.Net.Web.Admin/Controllers/User/CoreCmsUserController.cs

@@ -174,6 +174,15 @@
            {
                where = where.And(p => p.grade == grade);
            }
            //用户等级 int
            var isBaifenPromotion = Request.Form["isBaifenPromotion"].FirstOrDefault();
            if (!string.IsNullOrEmpty(isBaifenPromotion))
            {
                if(isBaifenPromotion=="1")
                where = where.And(p => p.IsBaifenPromotion == true);
                else
                    where = where.And(p => p.IsBaifenPromotion == false);
            }
            //创建时间 datetime
            var createTime = Request.Form["createTime"].FirstOrDefault();
            if (!string.IsNullOrEmpty(createTime))