From 29bf38f64c14321cf435e897c396111e92ab03a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 26 五月 2025 16:49:52 +0800
Subject: [PATCH] 解决合并冲突
---
WebAPI/Models/ClsGy_Material_Model.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 341573b..7f2c508 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -39,9 +39,9 @@
public long HUnitGroupID;
public long HMaterTypeID;
public double HPlanPrice;
- public int HUSEORGID;
+ //public int HUSEORGID;
public int HERPItemID;
- public int HCREATEORGID;
+ // public int HCREATEORGID;
public int HPlanMode;
public int HBatchManager;
public string HOldMaterNumber;
--
Gitblit v1.9.1