Merge branch 'release0123' into V1.5.9

wxr

2022-06-30 59e221cdb1ba8a666f68c5a2014e59e6f1870b43

 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>
        /// 产品厂商