Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r36851 -r37868
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 36851)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 37868)
@@ -1543,9 +1543,9 @@
 			}
 		}
 	}
-	Ext.Ajax.timeout = 300 * 000;
+	Ext.Ajax.timeout = 300000;
 	Ext.Ajax.request({
-		timeout: 300 * 000,
+		timeout: 300000,
 		url: WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadToussePrintData.do',
 		params: { ids: ids ,isMergeRemark:isMergeRemark },
 		success: function (response) {