From f16634534cb597538d8c3a1e2d1eaa897f1eaa29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=86=B0=E5=86=B0?= <437394478@qq.com>
Date: Fri, 21 Aug 2026 14:16:05 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A#EQD-7093=20=E5=9B=BD=E8=81=94?=
=?UTF-8?q?=E6=B0=91=E7=94=9F-=E4=BA=A4=E6=98=93=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E4=B9=A6=E6=A0=A1=E9=AA=8C=EF=BC=882=EF=BC=89=E9=92=88?=
=?UTF-8?q?=E5=AF=B9ETF=E6=A0=87=E7=9A=84=E8=8E=B7=E5=8F=96=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E4=BF=A1=E6=81=AF=E5=B9=B6=E4=B8=94=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=86=E7=B1=BB=E3=80=82=20ETF=E4=BA=A4?=
=?UTF-8?q?=E6=98=93=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=B8=AD=E5=A1=AB=E5=85=85?=
=?UTF-8?q?=E5=8F=82=E8=80=83=E6=A0=87=E7=9A=84=E8=AF=81=E5=88=B8=E5=85=A8?=
=?UTF-8?q?=E7=A7=B0=E3=80=81=E5=8F=82=E8=80=83=E6=A0=87=E7=9A=84=E5=9F=BA?=
=?UTF-8?q?=E9=87=91=E7=AE=A1=E7=90=86=E4=BA=BA=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../YLErp.Core/DBModels/underlying_manager.cs | 14 ++++++
.../Dictionary/db_dictionaries.xml | 13 ++++++
...模板-【客户看多】-【债券ETF】-清洁版.docx | Bin 45307 -> 42742 bytes
...模板-【客户看空】-【债券ETF】-清洁版.docx | Bin 46671 -> 44477 bytes
.../TradeConfirmationGenerator.cs | 3 +-
.../UnderlyingFundManagerMappingTest.cs | 20 ++++++++
YLErpDAL/Modules/AppModule/AppUpgrader.cs | 43 ++++++++++++++++++
.../underlying_managerController.cs | 20 ++++++++
.../underlying_managerEdit.cshtml | 34 ++++++++++++--
.../underlying_managerView.cshtml | 10 +++-
.../Scripts/app/underlying/underlyingedit.js | 16 +++++--
11 files changed, 165 insertions(+), 8 deletions(-)
create mode 100644 UnitTestProject/Modules/UnderlyingModule/UnderlyingFundManagerMappingTest.cs
diff --git a/Framework/YLErp.Core/DBModels/underlying_manager.cs b/Framework/YLErp.Core/DBModels/underlying_manager.cs
index 2808b5f5..b1187b6e 100644
--- a/Framework/YLErp.Core/DBModels/underlying_manager.cs
+++ b/Framework/YLErp.Core/DBModels/underlying_manager.cs
@@ -137,6 +137,20 @@ namespace YLErp.DBModels
[DisplayName("标的名称")]
public string UnderlyingName { set; get; }
+ ///
+ /// 基金及基金专户的基金管理人名称
+ ///
+ [Column("investadvisorname")]
+ [DisplayName("基金管理人")]
+ public string InvestAdvisorName { get; set; }
+
+ ///
+ /// 基金及基金专户所属的 ETF 子类，保存“ETF 子类”字典项名称
+ ///
+ [Column("etf_sub_type")]
+ [DisplayName("ETF 子类")]
+ public string EtfSubType { get; set; }
+
///
/// 标的英文名
diff --git a/Framework/YLErp.Resources/Dictionary/db_dictionaries.xml b/Framework/YLErp.Resources/Dictionary/db_dictionaries.xml
index 97770296..b56ab947 100644
--- a/Framework/YLErp.Resources/Dictionary/db_dictionaries.xml
+++ b/Framework/YLErp.Resources/Dictionary/db_dictionaries.xml
@@ -42,4 +42,17 @@
+
+
+