From 0b5b6ec781a8cb3400ad34693792bad07e97a00c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 09:32:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs b/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
index e3d96a7..b4f5d8b 100644
--- a/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
+++ b/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
@@ -1,4 +1,6 @@
锘縰sing 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>
/// 浜у搧鍘傚晢
--
Gitblit v1.8.0