Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-10 d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86

 _Main/UI/MacroPlannerWebApp/Component_FormFillingCapacityOrder/Response_PanelFillingCapacityOrder_ButtonDeduct_OnClick.def

@@ -13,7 +13,11 @@
  {
    Body:
    [*
      H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
      //H_FunctionClass::SM_OrderHedgingEx( MacroPlan, ApplicationMacroPlanner.GetUserName() );
      
      FillingCapacityOrder::OrderOffset( MacroPlan );
      
      WebMessageBox::Success( "冲减成功！！！", true );
    *]
    GroupServerCalls: false
  }