Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_DialogFusionData/Response_pnlReceiveDatas_lblSpecializedDisplay_OnCreated.def

@@ -9,7 +9,7 @@
  {
    Body:
    [*
      targetPanelMaterialAll := select( GlobalOTDTable, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "专显" );
      targetPanelMaterialAll := select( GlobalOTDSOP, PanelMaterialAll, tempPMA, tempPMA.BusinessType() = "专显" );
      this.Text( guard( targetPanelMaterialAll.ReleaseDate(), "无数据" ) );
    *]
    GroupServerCalls: false