Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-14 a7adf98ff4ac801342853b1f9231cc1ab5acebf3

03921090f6e72c36cfcdc23d0a2976aca50dd397 目录中不存在 ZigbeeApp/GateWay.Droid/GateWay.Droid.sln