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

Kevin Kok Khah Whey

2023-10-18 d5e46a7a9f2cb9123b9aafb39a20e14059faa2e4

 _Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_Import_OnClick.def

@@ -16,7 +16,7 @@
          
          fileName := uploadJson.Get( "name" ).GetString();
          base64String := uploadJson.Get( "data" ).GetString();
          CapacityAllocationResultsRuleConfiguration::Import( GlobalOTDTable, base64String );
          CapacityAllocationResultsRuleConfiguration::Import( GlobalOTDSOP, base64String );
          
          WebMessageBox::Success( "上传成功", true );
        }