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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

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

old mode 100755
new mode 100644
@@ -1540,7 +1540,7 @@
            deviceConditionsInfo.Add(Key, Value);
        }


        

    }
}