Merge branch 'dev_cyy' into dev

hongji.li

2023-09-24 2709b3e28de35a866a65fa72f589d38a43d5045b

 _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 );