From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
index 1127786..461e0ba 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍1:55:15
+ * @date : 2024/4/24涓婂崍10:48:23
* @desc : 鐗╂枡瀹㈡埛鍏宠仈琛�
*/
namespace Admin.NET.Core
@@ -33,7 +33,7 @@
[Comment("鐗╂枡缂栧彿")]
[Required]
[MaxLength(50)]
- public string MaterialNo { get; set; }
+ public string MaterialCode { get; set; }
/// <summary>
@@ -64,12 +64,20 @@
/// <summary>
- /// 瀹㈡埛鍚嶇О
+ /// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
- [Comment("瀹㈡埛鍚嶇О")]
+ [Comment("瀹㈡埛鑻辨枃鍚嶇О")]
+ [MaxLength(255)]
+ public string CustEnglishName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛涓枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛涓枃鍚嶇О")]
[Required]
- [MaxLength(50)]
- public string CustName { get; set; }
+ [MaxLength(255)]
+ public string CustChinaName { get; set; }
--
Gitblit v1.9.3