From 15f115d0f5aa1312b99d79a18eb8c975118cdc80 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期二, 05 三月 2024 12:19:44 +0800 Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop --- CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs index 80f733d..54e6806 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs @@ -1,10 +1,10 @@ /*********************************************************************** * Project: CoreCms - * ProjectName: 鏍稿績鍐呭绠$悊绯荤粺 - * Web: https://www.corecms.net - * Author: 澶х伆鐏� - * Email: jianweie@163.com - * CreateTime: 2021/1/31 21:45:10 + * ProjectName: 鐧惧垎鍏垫硶绠$悊绯荤粺 + * Web: hhtp://chuanyin.com + * Author: + * Email: + * CreateTime: 202403/02 * Description: 鏆傛棤 ***********************************************************************/ @@ -33,9 +33,9 @@ namespace CoreCms.Net.Web.Admin.Controllers { /// <summary> - /// 鍒嗛攢鍟嗚〃 + /// 缁忛攢鍟嗚〃 /// </summary> - [Description("鍒嗛攢鍟嗚〃")] + [Description("缁忛攢鍟嗚〃")] [Route("api/[controller]/[action]")] [ApiController] [RequiredErrorForAdmin] @@ -115,7 +115,7 @@ //鐢ㄦ埛Id int var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0); if (userId > 0) where = where.And(p => p.userId == userId); - //鍒嗛攢鍟嗗悕绉� nvarchar + //缁忛攢鍟嗗悕绉� nvarchar var name = Request.Form["name"].FirstOrDefault(); if (!string.IsNullOrEmpty(name)) where = where.And(p => p.name.Contains(name)); //鍒嗛攢绛夌骇 int @@ -301,7 +301,7 @@ var isDistribution = await _coreCmsDistributionServices.ExistsAsync(p => p.userId == user.id); if (isDistribution) { - jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戝凡缁忔槸鍒嗛攢鍟嗕簡銆�"; + jm.msg = "鎻愪氦鐨勩�愬凡娉ㄥ唽鎵嬫満鍙枫�戝凡缁忔槸缁忛攢鍟嗕簡銆�"; return jm; } var model = new CoreCmsDistribution(); -- Gitblit v1.9.1