Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-mobile into f-6.7.0

src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java

@@ -75,7 +75,7 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
     @ResponseBody
     @Security
     @RequestMapping(value = "/queryCanInvoiceOrder", method = RequestMethod.GET)
-    public Response<PagedResponseBean<OrderListBean>> queryCanInvoiceOrder(@RequestParam String token,OrderQuery orderQuery ) {
+    public Object queryCanInvoiceOrder(@RequestParam String token,OrderQuery orderQuery ) {
         Response<PagedResponseBean<OrderListBean>> response = new Response<PagedResponseBean<OrderListBean>>();
         Request<OrderQuery> request = new Request<OrderQuery>();
         request.setBody(orderQuery);
@@ -87,7 +87,7 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
     @ResponseBody
     @Security
     @RequestMapping(value = "/addInvoice/{token}", method = RequestMethod.POST)
-    public Response<Integer> addInvoice(@PathVariable String token,@RequestBody InvoiceBean invoiceBean) {
+    public Object addInvoice(@PathVariable String token,@RequestBody InvoiceBean invoiceBean) {
     	invoiceBean.setUid(UserContext.getUserId());
     	Request<InvoiceBean> request = new Request<InvoiceBean>();
     	request.setBody(invoiceBean);
@@ -98,7 +98,7 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
     @ResponseBody
     @Security
     @RequestMapping(value = "/listInvoice/{token}", method = RequestMethod.GET)
-    public Response<PagedResponseBean<InvoiceBean>> invoiceRecord(@PathVariable String token) {
+    public Object invoiceRecord(@PathVariable String token) {
     	InvoiceinfoQuery query = new InvoiceinfoQuery();
     	query.setUid(UserContext.getUserId());
     	query.setSortField("invoiceId");