首次合并了全部的代码

黄学彪

2019-10-15 2bf5ec775cb57d8015bee58c745a1e48081ff1b1

 ZigbeeApp/Shared/Common/House.cs

@@ -402,10 +402,13 @@
        /// GetCurrentFloorName
        /// </summary>
        /// <returns></returns>
        public string GetCurrentFloorName()
        public string GetCurrentFloorName
        {
            get
        {
            return GetFloorName(CurrentFloorId);
        }
        }

        /// <summary>
        /// GetFloorName