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

lihongji

2024-10-12 f1de76007e7834e17d87712e3342efd84876c200

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditForecast/Component_PanelOrigin.def

@@ -14,13 +14,14 @@
        AllowEmpty: true
        DataBinding: 'DataHolderDialogData.Data.Origin'
        Label: 'Origin'
        Strings: ';TRX;PPA;IDS'
        Strings: ';CC-TRC;DL-TRC;PPA;IDS'
        Taborder: 0
      ]
    }
  ]
  Properties:
  [
    FixedSize: true
    Taborder: 8
  ]
}