冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.PhartRelation.Core/02-universal/03-import/01-excel/UniversalChartExcelImportCtrl.cs

@@ -1,6 +1,4 @@
using Yw.WinFrmUI.Phart;

namespace HStation.WinFrmUI
namespace HStation.WinFrmUI
{
    public partial class UniversalChartExcelImportCtrl : DevExpress.XtraEditors.XtraUserControl
    {
@@ -22,7 +20,7 @@
            {
                XtraMessageBox.Show(err_msg);
                return;
            } 
            }
            this.universalChartExcelEditCtrl.SetBindingData(curve_type, list);
        }