From 21dad2a2c73262cd6787bf78b4806de0b8b20bac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 29 五月 2025 09:20:53 +0800
Subject: [PATCH] 合并冲突 2025-5-29 9:20
---
WebAPI/Models/ClsGy_EquipFileMain.cs | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Models/ClsGy_EquipFileMain.cs b/WebAPI/Models/ClsGy_EquipFileMain.cs
index 97e9fda..ef4ec11 100644
--- a/WebAPI/Models/ClsGy_EquipFileMain.cs
+++ b/WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -36,6 +36,11 @@
public int HEquipDotCheckRuleInterID=0;
public int HEquipMaintainRuleInterID=0;
public int HSourceID = 0;
-
+ public int HCREATEORGID;
+ public int HUSEORGID;
+ public string HIPAddress; // varchar(50) //鏁伴噰IP鍦板潃
+ public string HLinkNETMode; // varchar(50) //鑱旂綉鏂瑰紡
+ public string HCollectMode; // varchar(50) //閲囬泦鏂瑰紡
+ public string HCollectClass; // varchar(50) //閲囬泦绫诲瀷
}
}
\ No newline at end of file
--
Gitblit v1.9.1