合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/SharedContent/SearchConfigureSharedMainForm.cs
@@ -9,7 +9,7 @@
    /// <summary>

    /// 查看已配置共享内容的主界面

    /// </summary>

    public class SearchConfigureSharedMainForm : EditorCommonForm

    public class LookSharedContentForm : EditorCommonForm

    {

        #region ■ 变量声明___________________________