From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
Dto/HStation.Dto.Assets.Core/18-pressmeter/02-main/AssetsPressmeterMainDto.cs | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Dto/HStation.Dto.Assets.Core/18-pressmeter/02-main/AssetsPressmeterMainDto.cs b/Dto/HStation.Dto.Assets.Core/18-pressmeter/02-main/AssetsPressmeterMainDto.cs
index ecb53e2..0170c83 100644
--- a/Dto/HStation.Dto.Assets.Core/18-pressmeter/02-main/AssetsPressmeterMainDto.cs
+++ b/Dto/HStation.Dto.Assets.Core/18-pressmeter/02-main/AssetsPressmeterMainDto.cs
@@ -22,6 +22,7 @@
this.Paras = rhs.Paras;
this.Flags = rhs.Flags;
this.TagName = rhs.TagName;
+ this.KeyWords = rhs.KeyWords;
this.SortCode = rhs.SortCode;
this.Description = rhs.Description;
}
--
Gitblit v1.9.3