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

yypsybs

2023-10-18 5fa4a6a06c62fd41731ff6cc1f1f6e031bd7436f

 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialTM17/Response_DataHolderPanelTM17_OnDataChanged.def

@@ -9,7 +9,7 @@
  {
    Body:
    [*
      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "TM17" );
      if ( not isnull( targetPanelMaterialAll ) ) {
        this.Data( targetPanelMaterialAll );
      }