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/ACZbGatewayUpdateMenuForm.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
index 716466e..ba2f8cd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/AirConditioner/ACZbGatewayUpdateMenuForm.cs
@@ -15,7 +15,7 @@
/// <summary>
/// 璁惧
/// </summary>
- private AC deviceAc = null;
+ private CommonDevice deviceAc = null;
#endregion
@@ -26,7 +26,7 @@
/// </summary>
/// <param name="i_deviceAc">璁惧</param>
/// <param name="hadNewVersion">鎷ユ湁鏂扮増鏈�</param>
- public void ShowForm(AC i_deviceAc, bool hadNewVersion)
+ public void ShowForm(CommonDevice i_deviceAc, bool hadNewVersion)
{
this.deviceAc = i_deviceAc;
--
Gitblit v1.8.0