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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml

@@ -165,4 +165,4 @@
      <!--  </>值来自开发者平台取得的AppKey-->
      <!-- 极光推送结束 -->
   </application>
</manifest>
</manifest>