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

WJC

2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112

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

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

        


    }
}