From 985abd7ee6049147119518aa41fb2d08c0cfc40d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 17:56:12 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
index 335f45b..aef3ae0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayModuleUpdateForm.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 璁惧
/// </summary>
- private AC deviceAc = null;
+ private CommonDevice deviceAc = null;
/// <summary>
/// 鍓嶅洖閫夋嫨鐨勬帶浠�
/// </summary>
@@ -33,7 +33,7 @@
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
/// <param name="i_deviceAc">璁惧</param>
- public void ShowForm(AC i_deviceAc)
+ public void ShowForm(CommonDevice i_deviceAc)
{
this.deviceAc = i_deviceAc;
this.otaDevice = Common.LocalDevice.Current.GetOTADevice(i_deviceAc.DeviceAddr);
--
Gitblit v1.8.0