Merge branch 'dev' into dev_yy

yanyuan

2023-11-09 92ecb46f3f2cfcae338d26cd56855018ba18b449

 _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/_ROOT_Component_DialogEditPriorityFactorDetail.def

文件名从 _Main/UI/MacroPlannerWebApp/Component_DialogEditPriorityFactorDetails/_ROOT_Component_DialogEditPriorityFactorDetails.def 修改
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
OrphanComponent DialogEditPriorityFactorDetails
OrphanComponent DialogEditPriorityFactorDetail
{
  #keys: '[414382.0.482374517]'
  BaseType: 'WebForm'
@@ -9,11 +9,11 @@
  [
    #child: pnlContent
    #child: pnlActions
    Component DataHolderEditPriorityFactorDetails
    Component DataHolderEditPriorityFactorDetail
    {
      #keys: '[414382.0.482495927]'
      #keys: '[414996.0.38864386]'
      BaseType: 'WebDataHolder'
      Databinding: 'shadow[PriorityFactorDetails]*'
      Databinding: 'shadow[PriorityFactorDetail]*'
      Properties:
      [
        Taborder: 2