合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs

old mode 100755
new mode 100644
@@ -6,8 +6,7 @@
{
    public class PanelFangyueFreshAirTargetForm : EditorCommonForm
    {
        #region ■ 变量声明___________________________



        #region ■ 变量声明___________________________ 
        /// <summary>

        /// 列表控件

        /// </summary>

@@ -308,9 +307,7 @@
                        //收集可以显示的设备

                        this.dicShowDevice[room.Id].Add(device);

                    }

                }





                }
            }

            return canShow;

        }

@@ -320,8 +317,7 @@
            bool canShow = false;

            return canShow;
        }



        }
        #endregion

    }

}