From df80023baf4e5eba2de7dcbe9dd1bdd3aeaa607e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 14 一月 2025 12:58:50 +0800
Subject: [PATCH] 设备档案 增加 字段; IP地址,MAC地址,联网方式,采集类型,采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型

---
 WebAPI/Models/Gy_WorkPayType.cs |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/WebAPI/Models/Gy_WorkPayType.cs b/WebAPI/Models/Gy_WorkPayType.cs
index 8d9cb07..f3c0d96 100644
--- a/WebAPI/Models/Gy_WorkPayType.cs
+++ b/WebAPI/Models/Gy_WorkPayType.cs
@@ -16,20 +16,11 @@
         public long HLevel { get; set; }
         public bool HEndFlag { get; set; }      //鏈骇鏍囧織
         public bool HStopflag { get; set; }     //绂佺敤鏍囧織
-<<<<<<< HEAD
-      
-        public string HRemark { get; set; }       //澶囨敞
-        public string HUseFlag { get; set; }      //浣跨敤鏍囧織
-       
-
-       
-=======
 
         public string HRemark { get; set; }       //澶囨敞
         public string HUseFlag { get; set; }      //浣跨敤鏍囧織
 
 
 
->>>>>>> dd451fc81f6d07d35c7674db87ca1f9ab7efd08c
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1