From 5fccb067ad7dc2dbcdacf8db642aa471488cd8f0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 20 二月 2025 15:24:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/ClsGy_EquipFileMain.cs |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Models/ClsGy_EquipFileMain.cs b/WebAPI/Models/ClsGy_EquipFileMain.cs
index 3f587f2..25cb238 100644
--- a/WebAPI/Models/ClsGy_EquipFileMain.cs
+++ b/WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -30,8 +30,15 @@
         public string HLogo;                //鈭�		varchar(50)	//鍝佺墝
         public int HSellSupID;              // 鈭�	int		//渚涘簲鍟�(Gy_Supplier)
         public int HMakeSupID;              // int		//鍒堕�犲晢 (Gy_Supplier) 
-        public int HEquipDotCheckRuleInterID;
-        public int HEquipMaintainRuleInterID;
-
+        public string HMainSourceFlag;              // varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
+        public string HMacAddress;              // varchar(50) //鏁伴噰鐗╃悊鍦板潃
+        public int HMainSourceID;                //   鈭�	int    		鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
+        public int HEquipDotCheckRuleInterID=0;
+        public int HEquipMaintainRuleInterID=0;
+        public int HSourceID = 0;
+        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