From 3946fe3c23ff022b7e1d27c2a29041496ef6d529 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
index 9af5e09..2e4091c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/BaseCustomerService.cs
@@ -16,7 +16,7 @@
namespace Admin.NET.Application
{
/// <summary>
- /// 寰�鏉ュ叧绯绘湇鍔�
+ /// 寰�鏉ュ崟浣嶆湇鍔�
/// </summary>
[ApiDescriptionSettings("WmsBase", Name = "BaseCustomer", Order = 100)]
[Route("api")]
@@ -42,7 +42,7 @@
}
/// <summary>
- /// 鍒嗛〉鏌ヨ寰�鏉ュ叧绯�
+ /// 鍒嗛〉鏌ヨ寰�鏉ュ崟浣�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -74,10 +74,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈠線鏉ュ叧绯诲垪琛�
+ /// 涓嶅垎椤垫煡璇㈠線鏉ュ崟浣嶅垪琛�
/// </summary>
- /// <param name="input">寰�鏉ュ叧绯绘煡璇㈠弬鏁�</param>
- /// <returns>(寰�鏉ュ叧绯�)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">寰�鏉ュ崟浣嶆煡璇㈠弬鏁�</param>
+ /// <returns>(寰�鏉ュ崟浣�)瀹炰緥鍒楄〃</returns>
[HttpGet("BaseCustomer/listNonPage")]
public async Task<List<BaseCustomerOutput>> ListNonPageAsync([FromQuery] BaseCustomerSearchNonPage input)
{
@@ -123,7 +123,7 @@
}
/// <summary>
- /// 鑾峰彇寰�鏉ュ叧绯�
+ /// 鑾峰彇寰�鏉ュ崟浣�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -134,7 +134,7 @@
}
/// <summary>
- /// 鑾峰彇寰�鏉ュ叧绯诲垪琛�
+ /// 鑾峰彇寰�鏉ュ崟浣嶅垪琛�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -147,7 +147,7 @@
#region 澧炪�佸垹銆佹敼
/// <summary>
- /// 澧炲姞寰�鏉ュ叧绯�
+ /// 澧炲姞寰�鏉ュ崟浣�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -167,7 +167,7 @@
}
/// <summary>
- /// 鍒犻櫎寰�鏉ュ叧绯�
+ /// 鍒犻櫎寰�鏉ュ崟浣�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -180,7 +180,7 @@
}
/// <summary>
- /// 鏇存柊寰�鏉ュ叧绯�
+ /// 鏇存柊寰�鏉ュ崟浣�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -205,7 +205,7 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆寰�鏉ュ叧绯诲姛鑳�
+ /// Excel妯℃澘瀵煎叆寰�鏉ュ崟浣嶅姛鑳�
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
@@ -381,7 +381,7 @@
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ叧绯荤殑Excel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇寰�鏉ュ崟浣嶇殑Excel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -389,7 +389,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\BaseCustomer{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(寰�鏉ュ叧绯�).xlsx", Encoding.GetEncoding("UTF-8"));
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(寰�鏉ュ崟浣�).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
--
Gitblit v1.9.3