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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs

@@ -39,5 +39,9 @@
        /// 隐匿配置

        /// </summary>
        public static HideOptionInfo HideOption = new HideOptionInfo();
        /// <summary>

        /// 文件加密秘钥

        /// </summary>
        public const string FileEncryptKey = "4^Olh_3f";
    }
}