Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp
===================================================================
diff -u -r18344 -r29513
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp	(.../operationReservationMergeInvoiceView.jsp)	(revision 18344)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationMergeInvoiceView.jsp	(.../operationReservationMergeInvoiceView.jsp)	(revision 29513)
@@ -40,36 +40,36 @@
 	pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today);
 	
 %>
-<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
-<script type="text/javascript" src="${ctx}/js/common.js"></script>
-<script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
-<script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
-<script type="text/javascript" src="${ctx}/js/extUtils.js"></script>
-<script type="text/javascript" src="${ctx}/js/configUtils.js"></script>
-<script type="text/javascript" src="${ctx}/ext/example/examples.js"></script>
-<script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
-<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/InvoiceTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/InvoicePlanTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/interface/ReturnGoodsRecordTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
-<script type="text/javascript" src="${ctx}/dwr/util.js"></script>
-<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
-<script type="text/javascript" src="${ctx}/js/dateHelper.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/configUtils.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/ext/example/examples.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/InvoiceTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/InvoicePlanTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ReturnGoodsRecordTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/engine.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/js/dateHelper.js?version=${svnRevision}"></script>
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"/>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
-<script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
+<script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>
 
 <!-- 紧急度 -->
-<script src="${ctx}/disinfectsystem/common/urgency.js"></script>
-<script src="${ctx}/js/globalKeyDown.js"></script>
-<script src="${ctx}/js/barcodeBtn.js"></script>
-<script type="text/javascript" src="operationReservationMergeInvoiceView.js"></script>
-<script type="text/javascript" src="operationReservationMergeInvoiceForm.js"></script>
-<script type="text/javascript" src="invoice.js"></script>
+<script src="${ctx}/disinfectsystem/common/urgency.js?version=${svnRevision}"></script>
+<script src="${ctx}/js/globalKeyDown.js?version=${svnRevision}"></script>
+<script src="${ctx}/js/barcodeBtn.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="operationReservationMergeInvoiceView.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="operationReservationMergeInvoiceForm.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="invoice.js?version=${svnRevision}"></script>
 <script type="text/javascript">
 	var project = '${profile}';
     var SSTS_DeviceMaintenance_Create = true;