Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev_lhj

hongji.li

2023-09-26 adb1e2a3ceae2acbe7f9ef6d6e3db5c1f982a763

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