From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突

---
 Service/HStation.Service.Assets.Core/02-dal/01-interface/IPumpPropContent.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-dal/01-interface/IPumpPropContent.cs b/Service/HStation.Service.Assets.Core/02-dal/01-interface/IPumpPropContent.cs
index a4cd8c9..2e62dfa 100644
--- a/Service/HStation.Service.Assets.Core/02-dal/01-interface/IPumpPropContent.cs
+++ b/Service/HStation.Service.Assets.Core/02-dal/01-interface/IPumpPropContent.cs
@@ -5,7 +5,7 @@
     /// <summary>
     ///
     /// </summary>
-    public interface IPumpPropContent : IBaseDAL<Entity.PumpPropContent>, IUpdateParas, IUpdateFlags, IUpdateTagName, IUpdateSorter
+    public interface IPumpPropContent : IBaseDAL<Entity.PumpPropContent>
     {
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3