From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
Vmo/HStation.Vmo.Assets.Core/15-Tank/AssetsTankSeriesVmo.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Vmo/HStation.Vmo.Assets.Core/15-Tank/AssetsTankSeriesVmo.cs b/Vmo/HStation.Vmo.Assets.Core/15-Tank/AssetsTankSeriesVmo.cs
index 31134b3..d747933 100644
--- a/Vmo/HStation.Vmo.Assets.Core/15-Tank/AssetsTankSeriesVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/15-Tank/AssetsTankSeriesVmo.cs
@@ -18,6 +18,7 @@
{
this.ID = rhs.ID;
this.ParentID = rhs.ParentID;
+ this.CatalogID = rhs.CatalogID;
this.Name = rhs.Name;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
@@ -33,6 +34,7 @@
{
this.ID = rhs.ID;
this.ParentID = rhs.ParentID;
+ this.CatalogID = rhs.CatalogID;
this.Name = rhs.Name;
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
--
Gitblit v1.9.3