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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Common/Logic.cs

@@ -46,7 +46,11 @@
        /// <summary>
        /// 推送内容
        /// </summary>
        public string LogicCustomPushText;
        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();