From 7b072c0563be4c57325f44fbf6ac828756ae582e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期六, 08 六月 2024 11:07:26 +0800
Subject: [PATCH] 解决冲突
---
Hydraulic/Hydro.MapView/Model/MeterViewModel.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
index 586cda1..1e26e91 100644
--- a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
@@ -18,10 +18,11 @@
return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t";
}
- public string GetTemplateID()
- {
- return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
- }
+ /*
+ public string GetTemplateID()
+ {
+ return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
+ }*/
[Category("鍩烘湰淇℃伅")]
[DisplayName("褰撻噺妯℃澘")]
--
Gitblit v1.9.3