Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/ZigBee/Device/Logic.cs

old mode 100644
new mode 100755
@@ -8,7 +8,6 @@
    [System.Serializable]
    public class Logic
    {

        /// <summary>
        /// 当前主网关ID
        /// </summary>
@@ -3767,6 +3766,5 @@
        //        return new Logic();
        //    }
        //}
        
    }
}