From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/Device/DeviceModule.cs | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Device/DeviceModule.cs b/HDL_ON/Entity/Device/DeviceModule.cs
index c110801..193e69d 100644
--- a/HDL_ON/Entity/Device/DeviceModule.cs
+++ b/HDL_ON/Entity/Device/DeviceModule.cs
@@ -14,6 +14,10 @@
/// </summary>
public string device_mac = "0281B9078C000000";
/// <summary>
+ /// 缃戝叧ID
+ /// </summary>
+ public string gatewayId = "";
+ /// <summary>
/// 璁惧绫诲瀷
/// 缃戝叧鐩墠涓衡�溾��
/// 璇煶闈㈡澘:4
@@ -21,12 +25,20 @@
public int gateway_type = 0;
public string model_id = "";
public string device_name = "hdl_bus_gatway";
- public string model_type = "HDL GWA01IP";
public string ip_address = "172.16.2.202";
public string local_data_encode = "false";
public string access_mode = "LAN";
public string oid = "";
-
-
+ public string device_model = "HDL-MGWIP.430";
+ /// <summary>
+ /// 璁惧瀛愮綉鍙疯澶囧彿锛�
+ /// FFFF
+ /// </summary>
+ public string addresses = "";
+ /// <summary>
+ /// 璁惧椹卞姩浠ｇ爜
+ /// 鍖哄垎鏄痓us璁惧锛岃繕鏄痥nx璁惧
+ /// </summary>
+ public string driver_code = "";
}
}
--
Gitblit v1.8.0