Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-10-14 ed09bf3eb41fcf1b79b083ac3d959f110b7e613b

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditShiftDayTime/Method_OnOK.def

@@ -6,7 +6,14 @@
  Body:
  [*
    // On ok
    Form.ApplyChanges();
    
    if ( isnull( DataHolderDialogData.Data() ) ) {
      ShiftDayTime::CreateData( MacroPlan, dtsStart.DateTime(),
                                dtsEnd.DateTime(), ddslName.Text() );
    } else {
      ShiftDayTime::EditData( MacroPlan, DataHolderDialogData.Data(), dtsStart.DateTime(),
                                dtsEnd.DateTime(), ddslName.Text() );
    }
    
    Form.Close();
  *]