Merge branch 'feature/0613-opt' into develop-new

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

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

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