Merge branch 'dev' into dev_yy

yanweiyuan3

2023-09-26 96376f881d2511382f1063242206cff71781ea0b

 _Main/UI/MacroPlannerWebApp/Component_DialogBusinessType/Method_ClickBtnOk.def

@@ -12,13 +12,11 @@
    // OnOk
    this.ApplyChanges();
    
    businessType := DataHolderBusinessType.Data().BusinessTypeName();
    DataHolderBusinessType.Data().Commit();
    
    //if( not isnull( DataHolderForm.Data() ) )
    //{
    //  // Access the form, select the new assumption
    //  DataHolderForm.Data().ListAssumptions().SelectByKey( DataHolderDialogData.Data().WrappedInstance().Key() );
    //}
    // PriorityFactor
    PriorityFactor::InitData( MacroPlan,businessType);
    
    this.Close();
  *]