From 9c1af7f5ec91917b4276b25406c86386fd337fbb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 16:35:44 +0800
Subject: [PATCH] 修改冲突后问题
---
WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/CatalogueCtrl.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git "a/WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/CatalogueCtrl.cs" b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/CatalogueCtrl.cs
similarity index 94%
rename from "WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/CatalogueCtrl.cs"
rename to WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/CatalogueCtrl.cs
index af2bdf4..012fde8 100644
--- "a/WinFrmUI/PBS.WinFrmUI.WE.Core/\346\226\260\346\226\207\344\273\266\345\244\271/01-catalogue/CatalogueCtrl.cs"
+++ b/WinFrmUI/PBS.WinFrmUI.WE.Core/WaterWE/01-catalogue/CatalogueCtrl.cs
@@ -3,7 +3,7 @@
using Yw.Untity;
using Yw.WinFrmUI;
-namespace HStation.WinFrmUI.WE
+namespace PBS.WinFrmUI.WE
{
/// <summary>
@@ -15,19 +15,19 @@
{
InitializeComponent();
this.treeList1.InitialDefaultSettings();
- this.treeList1.SelectImageList = ImageLib.Lib;
+ // this.treeList1.SelectImageList = ImageLib.Lib;
}
//鑱氱劍鏀瑰彉浜嬩欢
public event Action<long> ReloadEvent = null;
- private BLL.WE.Catalogue _bll = null;
+ private PBS.BLL.WE.Catalogue _bll = null;
private List<CatalogueViewModel> _allBindingList = new List<CatalogueViewModel>();
public async void SetBindingData()
{
- _bll = new BLL.WE.Catalogue();
+ _bll = new PBS.BLL.WE.Catalogue();
var alllist = await _bll.GetAll();
if (alllist != null)
{
@@ -69,7 +69,7 @@
var select = await _bll.GetByID(Convert.ToInt64(currentId));
rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
}
- var bll = new BLL.WE.Catalogue();
+ var bll = new PBS.BLL.WE.Catalogue();
var id = await bll.Insert(rhs);
if (id > 0)
{
--
Gitblit v1.9.3