From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Models/Gy_MateNumRelation_Sec.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_MateNumRelation_Sec.cs b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
index 2643e84..3a3ce30 100644
--- a/WebAPI/Models/Gy_MateNumRelation_Sec.cs
+++ b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
@@ -24,6 +24,8 @@
public bool HUsed { get; set; } //使用标记
+ public string HCusRelationModel { get; set; } //客户物料规格
+ public long HTemplateID { get; set; } //打印模板ID
}
}
\ No newline at end of file
--
Gitblit v1.9.1