From ba927b1faad68ab38d053ee9ea9eeac4b1a5531b Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 08:23:10 +0800
Subject: [PATCH] resolve merge conflicts: keep theirs for all binary files
---
WebAPI/Models/Gy_MateNumRelation_Sec.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Models/Gy_MateNumRelation_Sec.cs b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
index 3a3ce30..db1c440 100644
--- a/WebAPI/Models/Gy_MateNumRelation_Sec.cs
+++ b/WebAPI/Models/Gy_MateNumRelation_Sec.cs
@@ -27,5 +27,9 @@
public string HCusRelationModel { get; set; } //客户物料规格
public long HTemplateID { get; set; } //打印模板ID
+ public string HRemark { get; set; }
+ public long HCreateOrgID { get; set; }
+ public long HUSEORGID { get; set; }
+ public string HShopID { get; set; } //小卫商品id
}
}
\ No newline at end of file
--
Gitblit v1.9.1