Merge branch 'dev_fix_Branch' into dev_lhj

hongji.li

2023-11-06 817c03784e8d604780d9f2cd2ee3130c1a71f5d6

 _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
  }