From 3aedad63dd01f1fc5154cb520af32edab967d6e0 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 12 5月 2025 09:15:26 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs index af8372d..e23824b 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterials/WmsMaterial.cs @@ -14,12 +14,18 @@ /// <summary> /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛� /// </summary> - public string MaterialCode { get; set; } + public string MaterialNo { get; set; } /// <summary> /// 鐗╂枡鍚嶇О /// </summary> public string MaterialName { get; set; } + + + /// <summary> + /// 鍨嬪彿 + /// </summary> + public string MaterialModel { get; set; } /// <summary> /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 @@ -64,7 +70,7 @@ /// <summary> /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛� /// </summary> - public bool IsMainBranch { get; set; } + public YesNoEnum IsMainBranch { get; set; } /// <summary> /// 鐢熶骇宸ュ巶 -- Gitblit v1.9.3