冲突缺少文件补充

duheng

2024-09-23 651d1f87d2e0e26021c20f3667e1db7b1349b478

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/XhsSchemeAssetMgrPage.cs

@@ -80,9 +80,9 @@
        //临时---选择泵型号
        private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.SetBindingData();
            dlg.ShowDialog();
            //  var dlg = new AssetsAutoMatchingMainDlg();
            //     dlg.SetMatching();
            //    dlg.ShowDialog();
        }

        private async void barButtonItem2_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
@@ -115,10 +115,10 @@
        //自动匹配
        private void barBtnAutoMatch_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AssetsAutoMatchingMainDlg();
            dlg.SetBindingData();
            dlg.ShowDialog();

            /*  var dlg = new AssetsAutoMatchingMainDlg();
              dlg.SetMatching();
              dlg.ShowDialog();
  */
        }
    }
}