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

lihongji

2024-11-20 440be21e24e4cfb15e85ee1cf8522cd7d4acf21b

 _Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -20,6 +20,7 @@
        #child: abpAlgorithmPostProcessing
        #child: ActionBarPagePlan
        #child: ActionBarPageReport
        #child: ActionBarPageArchivePublish
      ]
    }
    Component dhBinaryDataPR id:dhBinaryDataPR_688