From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ZigbeeApp20200323/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs
similarity index 100%
rename from ZigbeeApp20200323/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/TextInputControl.cs

--
Gitblit v1.8.0