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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayProductInfoForm.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/GatewayProductInfoForm.cs
@@ -3,7 +3,7 @@
using System.Text;

using ZigBee.Device;



namespace Shared.Phone.UserCenter.GatewayAdd

namespace Shared.Phone.UserCenter.GatewayManage

{

    /// <summary>

    /// 网关产品信息的界面