Merge branch 'dev' into dev_hrh_global

haorenhui

2023-10-25 4269bd7e29b525a0e97e7283d2688e26df87b9f2

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPanelPullPlanReport/Method_New.def

@@ -5,7 +5,7 @@
  #keys: '[414702.0.158084611]'
  Body:
  [*
    panelMaterial := GlobalOTDTable.PanelMaterial( relshadow );
    panelMaterial := MacroPlan.PanelMaterial( relshadow );
    
    DataHolderDialogData.Data( &panelMaterial );