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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 ZigbeeApp/GateWay.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json

old mode 100644
new mode 100755