Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

 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;