Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -268,7 +268,7 @@
                     ""
                     </c:if>
                     ,"submitterDate":"<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"
-                    ,"money":"<fmt:formatNumber value="${workReimbursement.money}" pattern="#,#0.00"/>"
+                    ,"money":"<fmt:formatNumber value="${workReimbursement.money}" pattern="#,##0.00"/>"
                     ,"status":"${workReimbursement.status}"
                     <shiro:hasPermission name="workreimbursement:workReimbursementAll:del">
                     ,"candelete":

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -328,7 +328,7 @@
                     ""
                     </c:if>
                     ,"submitterDate":"<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"
-                    ,"money":"<fmt:formatNumber value="${workReimbursement.money}" pattern="#,#0.00"/>"
+                    ,"money":"<fmt:formatNumber value="${workReimbursement.money}" pattern="#,##0.00"/>"
                     ,"status":"${workReimbursement.status}"
                     <shiro:hasPermission name="workreimbursement:workReimbursement:del">
                     ,"candelete":