Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -543,6 +543,12 @@
 								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
+							</div>
+						</div>
 					</div>
 				</form:form>
 			</div>

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -600,6 +600,12 @@
 								<form:input path="widNumber" htmlEscape="false"  class=" form-control layui-input"/>
 							</div>
 						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label">开票金额：</label>
+							<div class="layui-input-block with-icon">
+								<form:input path="money" htmlEscape="false"  class=" form-control layui-input"/>
+							</div>
+						</div>
 					</div>
 				</form:form>
 			</div>