解决冲突

duheng

2024-06-08 7b072c0563be4c57325f44fbf6ac828756ae582e

 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("当量模板")]