合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 ZigbeeApp/Shared/Common/Logic.cs

@@ -47,6 +47,10 @@
        /// 推送内容
        /// </summary>
        public string LogicCustomPushText=string.Empty;
        /// <summary>
        /// 记录推送开关状态
        /// </summary>
        public int LogicIsCustomPushText = 0;

        //public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
        public TimeAttributeObj TimeAttribute = new TimeAttributeObj();