冲突

duheng

2024-05-13 8223887b96c33e509f8706d4a0d2548386af6c0d

 WinFrmUI/IStation.WinFrmUI.CalcErQu/PrjItemSpanTime/SetPrjItemSpanTimeCtrl.cs

@@ -18,7 +18,7 @@
        {
            InitializeComponent();

            var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
            var anaSetting = IStation.AnaGlobalParas.Setting;
            if (anaSetting == null)
                return;

@@ -381,7 +381,7 @@
            {
                return null;
            }
            var anaSetting = IStation.Calc.ErQu.GlobalParas.AnaSetting;
            var anaSetting = IStation.AnaGlobalParas.Setting;

            var startHour = anaSetting.StartHourPerDay;
            var statTime = anaDay.AddHours(startHour);