From 60cfd15db42bb816846072d027121d91ffd013b1 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期四, 25 四月 2024 14:39:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
index 15faa98..4e411ee 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.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
+ * Project: baifenBinfa
+ * ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
+ * Web: http://chuanyin.com
+ * Author:
+ * Email:
+ * CreateTime: 202403/02
* Description: 鏆傛棤
***********************************************************************/
@@ -34,9 +34,9 @@
namespace CoreCms.Net.Web.Admin.Controllers
{
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃
+ /// 缁忛攢鍟嗚鍗曡褰曡〃
///</summary>
- [Description("鍒嗛攢鍟嗚鍗曡褰曡〃")]
+ [Description("缁忛攢鍟嗚鍗曡褰曡〃")]
[Route("api/[controller]/[action]")]
[ApiController]
[RequiredErrorForAdmin]
@@ -105,7 +105,7 @@
{
where = where.And(p => p.id == id);
}
- //鐢ㄦ埛鍒嗛攢鍟唅d int
+ //鐢ㄦ埛缁忛攢鍟唅d int
var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
if (userId > 0)
{
@@ -130,7 +130,7 @@
{
where = where.And(p => p.buyUserNickName.Contains(buyUserNickName));
}
- //鍒嗛攢鐢ㄦ埛鏄电О nvarchar
+ //缁忛攢鐢ㄦ埛鏄电О nvarchar
var distributorName = Request.Form["distributorName"].FirstOrDefault();
if (!string.IsNullOrEmpty(distributorName))
{
@@ -284,7 +284,7 @@
mySheet.SetColumnWidth(0, 10 * 256);
var cell1 = headerRow.CreateCell(1);
- cell1.SetCellValue("鐢ㄦ埛鍒嗛攢鍟唅d");
+ cell1.SetCellValue("鐢ㄦ埛缁忛攢鍟唅d");
cell1.CellStyle = headerStyle;
mySheet.SetColumnWidth(1, 10 * 256);
@@ -420,7 +420,7 @@
{
where = where.And(p => p.id == id);
}
- //鐢ㄦ埛鍒嗛攢鍟唅d int
+ //鐢ㄦ埛缁忛攢鍟唅d int
var userId = Request.Form["userId"].FirstOrDefault().ObjectToInt(0);
if (userId > 0)
{
@@ -491,7 +491,7 @@
mySheet.SetColumnWidth(0, 10 * 256);
var cell1 = headerRow.CreateCell(1);
- cell1.SetCellValue("鐢ㄦ埛鍒嗛攢鍟唅d");
+ cell1.SetCellValue("鐢ㄦ埛缁忛攢鍟唅d");
cell1.CellStyle = headerStyle;
mySheet.SetColumnWidth(1, 10 * 256);
--
Gitblit v1.9.1