Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-07 b18e4004f21e9ec18e2984630888f6626befeb55

 _Main/UI/MacroPlannerWebApp/Component_DialogBusinessType/Method_ClickBtnOk.def

@@ -15,7 +15,7 @@
    businessType := DataHolderBusinessType.Data().BusinessTypeName();
    DataHolderBusinessType.Data().Commit();
    
    // PriorityFactor
     
    PriorityFactor::InitData( MacroPlan,businessType);
    
    this.Close();