Merge branch 'WJC' into wxr6

wxr

2021-11-18 a7885a24a152a164d7e26b12098ab92a0e272f24

 HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs

@@ -101,6 +101,17 @@
        /// 设备绑定方式 WIFI、QRSCAN、ZIG_BEE、ETHERNET
        /// </summary>
        public string bindType;

        /// <summary>
        /// icon文件名称
        /// </summary>
        public string IconName
        {
            get
            {
                return spk.Replace(".", "");
            }
        }
    }

}