From 8c948b413969f5b1acbe03c7cd46def09ccbf335 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 17 五月 2024 17:29:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Models/ClsGy_EquipFileMain.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Models/ClsGy_EquipFileMain.cs b/WebAPI/Models/ClsGy_EquipFileMain.cs
index 3f587f2..cf4fb2f 100644
--- a/WebAPI/Models/ClsGy_EquipFileMain.cs
+++ b/WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -30,8 +30,11 @@
         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 HEquipDotCheckRuleInterID=0;
+        public int HEquipMaintainRuleInterID=0;
+        public int HSourceID = 0;
 
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1