Merge branch 'release0123'

wxr

2022-08-04 eb76239882830f3960b8800bb0f2c90ca7b3f378

 HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs

@@ -28,6 +28,68 @@
        /// </summary>
        public string productPlatform;
    }
    /// <summary>
    /// 第三方集成品牌对象类
    /// </summary>
    public class IntegratedBrand_Iot
    {
        public IntegratedBrand_Iot()
        {
        }
        /// <summary>
        /// id
        /// </summary>
        public string authBrandId;

        public string brandName
        {
            get
            {
                if(Language.CurrentLanguage == "Chinese")
                {
                    return authBrandNameCn;
                }
                else
                {
                    return authBrandNameEn;
                }
            }
        }
        /// <summary>
        /// 品牌名称中文
        /// </summary>
        public string authBrandNameCn;
        /// <summary>
        /// 品牌名称英文
        /// </summary>
        public string authBrandNameEn;
        /// <summary>
        /// 品牌副标题(中文)
        /// </summary>
        public string authBrandSubheadCn;
        /// <summary>
        /// 品牌副标题(英文) 
        /// </summary>
        public string authBrandSubheadEn;
        /// <summary>
        /// 图片url
        /// </summary>
        public string authrBandIconUrl;
        /// <summary>
        /// 认证授权地址
        /// </summary>
        public string authorizationUrl;
        /// <summary>
        /// 是否已经授权
        /// </summary>
        public bool hasAuthorization;
        /// <summary>
        /// 公司id
        /// </summary>
        public string companyId;

        public string clientId;
    }

    /// <summary>
    /// 第三方设备信息