From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/Entity/Device/DeviceModule.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Device/DeviceModule.cs b/HDL_ON/Entity/Device/DeviceModule.cs
index 467913f..ed330ea 100644
--- a/HDL_ON/Entity/Device/DeviceModule.cs
+++ b/HDL_ON/Entity/Device/DeviceModule.cs
@@ -14,11 +14,15 @@
/// </summary>
public string device_mac = "0281B9078C000000";
/// <summary>
+ /// 缃戝叧ID
+ /// </summary>
+ public string gatewayId = "";
+ /// <summary>
/// 璁惧绫诲瀷
/// 缃戝叧鐩墠涓衡�溾��
/// 璇煶闈㈡澘:4
/// </summary>
- public int gateway_type = 0;
+ public string gateway_type = "";
public string model_id = "";
public string device_name = "hdl_bus_gatway";
public string ip_address = "172.16.2.202";
@@ -26,8 +30,6 @@
public string access_mode = "LAN";
public string oid = "";
public string device_model = "HDL-MGWIP.430";
-
- public string gatewayId = "";
/// <summary>
/// 璁惧瀛愮綉鍙疯澶囧彿锛�
/// FFFF
--
Gitblit v1.8.0