From a8ccc992964272f6a74631e8c164e8c91e5cb6d4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 16:47:29 +0800
Subject: [PATCH] 处理冲突
---
Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpPartMainVmo.cs | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpPartMainVmo.cs b/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpPartMainVmo.cs
index 0d47db6..1da9582 100644
--- a/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpPartMainVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/01-PumpMainManage/PumpPartMainVmo.cs
@@ -1,10 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace HStation.Vmo
+锘縩amespace HStation.Vmo
{
public class AssetsPumpPartMainVmo
{
@@ -14,6 +8,11 @@
public long ID { get; set; }
/// <summary>
+ /// 娉佃澶嘔D
+ /// </summary>
+ public long PartID { get; set; }
+
+ /// <summary>
/// 娉电郴鍒桰D
/// </summary>
public long SeriesID { get; set; }
--
Gitblit v1.9.3