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 | 139 +++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 75 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 41e21be..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
@@ -3,10 +3,10 @@
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
-{
-
+{
+
/// <summary>
- /// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
+ /// 寰�鏉ュ叧绯绘煡璇㈠弬鏁�
/// </summary>
public class BaseCustomerSearch : PageInputBase
{
@@ -14,96 +14,96 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public virtual List<string> CreatedTime { get; set; }
-
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
public virtual List<string> UpdatedTime { get; set; }
-
+
/// <summary>
/// 鍒涘缓鑰呭悕绉�
/// </summary>
public virtual string CreatedUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭悕绉�
/// </summary>
public virtual string UpdatedUserName { get; set; }
-
+
}
- /// <summary>
- /// 瀹㈡埛妗ｆ涓嶅垎椤垫煡璇㈠弬鏁�
+ /// <summary>
+ /// 寰�鏉ュ叧绯讳笉鍒嗛〉鏌ヨ鍙傛暟
/// </summary>
public class BaseCustomerSearchNonPage : PageInputNonPageBase
{
@@ -111,190 +111,179 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int? CustType { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum? CustType { get; set; }
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-
+ public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
/// <summary>
/// 鏇存柊鏃堕棿
/// </summary>
- public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-
+ public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
+
/// <summary>
/// 鍒涘缓鑰呭悕绉�
/// </summary>
public virtual string CreatedUserName { get; set; }
-
+
/// <summary>
/// 淇敼鑰呭悕绉�
/// </summary>
public virtual string UpdatedUserName { get; set; }
-
+
}
/// <summary>
- /// 瀹㈡埛妗ｆ杈撳叆鍙傛暟
+ /// 寰�鏉ュ叧绯昏緭鍏ュ弬鏁�
/// </summary>
public class BaseCustomerInput
{
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [Required(ErrorMessage = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")]
- public virtual string CustCode { get; set; }
-
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
[Required(ErrorMessage = "瀹㈡埛涓枃鍚嶇О涓嶈兘涓虹┖")]
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
[Required(ErrorMessage = "绫诲瀷涓嶈兘涓虹┖")]
- public virtual BaseCustomerTypeEnum CustType { get; set; }
-
- /// <summary>
- /// 绫诲瀷鍚嶇О
- /// </summary>
- public virtual string CustTypeName { get; set; }
-
+ public virtual Admin.NET.Core.BaseCustomerTypeEnum CustType { get; set; }
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏂板鍙傛暟
+ /// 寰�鏉ュ叧绯绘柊澧炲弬鏁�
/// </summary>
public class AddBaseCustomerInput : BaseCustomerInput
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鍒犻櫎鍙傛暟
+ /// 寰�鏉ュ叧绯诲垹闄ゅ弬鏁�
/// </summary>
public class DeleteBaseCustomerInput : BaseId
{
}
/// <summary>
- /// 瀹㈡埛妗ｆ鏇存柊鍙傛暟
+ /// 寰�鏉ュ叧绯绘洿鏂板弬鏁�
/// </summary>
public class UpdateBaseCustomerInput : BaseCustomerInput
{
@@ -303,11 +292,11 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
- /// 瀹㈡埛妗ｆ鑾峰彇鍗曚釜鍙傛暟
+ /// 寰�鏉ュ叧绯昏幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeBaseCustomerInput : BaseId
{
--
Gitblit v1.9.3