在线点餐h5接口

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java

@@ -45,7 +45,8 @@ public interface RemoteOnlineCanteenSpuService {
      * @return
      */
     @GetMapping("/canteenOnlineSpu/app/getCanteenSpuList")
-    R getCanteenSpuList(@RequestParam(value = "categoryId",required = false)String categoryId);
+    R getCanteenSpuList(@RequestParam(value = "categoryId", required = false) String categoryId,
+                        @RequestParam(value = "merchantId") String merchantId);
 
 
     /**