From f2333318a31e92f6cbc3a572d8eb9fae9da0f892 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 12 十月 2024 13:59:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
index edbab37..ee342fb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditPipeMainDlg.cs
@@ -3,18 +3,18 @@
namespace HStation.WinFrmUI.Assets
{
- public partial class EditPipeMainDlg : DevExpress.XtraEditors.XtraForm
+ public partial class EditAssetsPipeMainDlg : DevExpress.XtraEditors.XtraForm
{
- public EditPipeMainDlg()
+ public EditAssetsPipeMainDlg()
{
InitializeComponent();
this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
}
private ToolTipControlInfo toolTipController;
- private Vmo.PipeMainVmo _PipeLineVmo = null;
+ private Vmo.AssetsPipeMainVmo _PipeLineVmo = null;
- public async void SetBindingData(Vmo.PipeMainVmo PipeLineVmo)
+ public async void SetBindingData(Vmo.AssetsPipeMainVmo PipeLineVmo)
{
_PipeLineVmo = PipeLineVmo;
var allCaliber = await new Yw.BLL.SysDictData().GetByTypeCode("1");
@@ -52,7 +52,7 @@
this.TextEditKeyWorld.Text = _PipeLineVmo.KeyWord;
}
- public event Func<Vmo.PipeMainVmo, Task<bool>> ReloadDataEvent = null;
+ public event Func<Vmo.AssetsPipeMainVmo, Task<bool>> ReloadDataEvent = null;
//鏁版嵁楠岃瘉
private bool Valid()
--
Gitblit v1.9.3