Merge branch 'dev'

renhao

2023-10-18 ff1d40a1a235da7c3bdfa26070af267f19c7a3d3

 _Main/UI/MacroPlannerWebApp/Component_FormPanelMaterialSportsHealth/Response_DataHolderPanelSportsHealth_OnDataChanged.def

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