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/CoreCmsDistributionOrderController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
index 5339bfd..4f5eaf9 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionOrderController.cs
@@ -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)
{
@@ -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