Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

 HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs

@@ -1,4 +1,6 @@
using System;
using Shared;

namespace HDL_ON.Entity
{
    /// <summary>
@@ -42,6 +44,22 @@
        /// 产品名称
        /// </summary>
        public string productName;
        public string productNameEn;

        public string ProductShowName
        {
            get
            {
                if(Language.CurrentLanguage == "Chinese")
                {
                    return productName;
                }
                else
                {
                    return productNameEn;
                }
            }
        }

        /// <summary>
        /// 产品厂商