Merge branch 'develop-new' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/OmsPortalOrderController.java

@@ -120,6 +120,7 @@ public class OmsPortalOrderController {
      * feign 接口
      */
     @RequestMapping(value = "/queryOrderList", method = RequestMethod.GET)
+    @ResponseBody
     HttpResponseResult<List<OmsOrderDetail>> queryOrderList(@RequestParam("status") String status,
                                                             @RequestParam("userId") Long userId) {
         return HttpResponseResult.succeed(portalOrderService.queryOrderList(userId, status));