Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs

@@ -175,7 +175,7 @@
        {
            if (TimeCheck)
            {
                if (DateTime.Now > this.selectDateTime)
                if (DateTime.Now > this.selectDateTime.AddMinutes(1))
                {
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TempPwdSettingTip);
                    throw new Exception("stop");