From 4d14b84903bf0277c5e8b9b3138c5e1d981e95db Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 11:01:31 +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/Dto/BaseCustomerInput.cs | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
index d179e9d..f4f854e 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -6,7 +6,7 @@
{
/// <summary>
- /// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
+ /// 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
/// </summary>
public class BaseCustomerSearch : PageInputBase
{
@@ -33,7 +33,7 @@
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
/// <summary>
/// 绫诲瀷鍚嶇О
@@ -103,7 +103,7 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ涓嶅垎椤垫煡璇㈠弬鏁�
+ /// 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class BaseCustomerSearchNonPage : PageInputNonPageBase
{
@@ -130,7 +130,7 @@
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
/// <summary>
/// 绫诲瀷鍚嶇О
@@ -200,18 +200,14 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ杈撳叆鍙傛暟
+ /// 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
/// </summary>
public class BaseCustomerInput
{
/// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- public virtual string CustCode { get; set; }
-
- /// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
+ [Required(ErrorMessage = "瀹㈡埛涓枃鍚嶇О涓嶈兘涓虹┖")]
public virtual string CustChinaName { get; set; }
/// <summary>
@@ -227,12 +223,8 @@
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int CustType { get; set; }
-
- /// <summary>
- /// 绫诲瀷鍚嶇О
- /// </summary>
- public virtual string CustTypeName { get; set; }
+ [Required(ErrorMessage = "绫诲瀷涓嶈兘涓虹┖")]
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum CustType { get; set; }
/// <summary>
/// 鑱旂郴浜�
@@ -277,21 +269,21 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏂板鍙傛暟
+ /// 寰�鏉ュ叧绯绘柊澧炲弬鏁�
/// </summary>
public class AddBaseCustomerInput : BaseCustomerInput
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鍒犻櫎鍙傛暟
+ /// 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
/// </summary>
public class DeleteBaseCustomerInput : BaseId
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏇存柊鍙傛暟
+ /// 寰�鏉ュ叧绯绘洿鏂板弬鏁�
/// </summary>
public class UpdateBaseCustomerInput : BaseCustomerInput
{
@@ -304,7 +296,7 @@
}
/// <summary>
- /// 瀹㈡埛妗ｆ鑾峰彇鍗曚釜鍙傛暟
+ /// 寰�鏉ュ叧绯昏幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeBaseCustomerInput : BaseId
{
--
Gitblit v1.9.3