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

lihongji

2024-11-28 e8e4aac007c3d1356813e4568a148cf46bbff458

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def

@@ -14,7 +14,7 @@
        AllowEmpty: true
        DataBinding: 'DataHolderDialogData.Data.Origin'
        Label: 'Origin'
        Strings: ';CC-TRC;DL-TRC;PPA;IDS'
        Strings: 'CC-TRC;DL-TRC;PPA;IDS'
        Taborder: 0
      ]
    }