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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorlockDialog.cs

old mode 100644
new mode 100755
@@ -1,5 +1,5 @@
using System;
//using Android.Icu.Lang;//ios不需要，android需要；
//using Android.Icu.Lang;

namespace Shared.Phone.UserCenter.DoorLock
{