From b16ab1b60763505139d0f62d02e26e9033f89a59 Mon Sep 17 00:00:00 2001
From: czx <28353131@qq.com>
Date: Wed, 20 Jan 2021 10:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=EF=BC=9A?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=8A=A0=E8=8F=9C=E5=8A=A0=E9=A5=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E4=BF=A1=E6=81=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/fantang/controller/ClientController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
index 31e16d077..8bb3510c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
@@ -384,7 +384,9 @@ public class ClientController extends BaseController {
     @GetMapping("/getFoodList")
     public AjaxResult getFoodList() {
         QueryWrapper<FtFoodDao> wrapper = new QueryWrapper<>();
-        wrapper.eq("type", 1);
+        wrapper.eq("type", 1)
+                .or()
+                .eq("type", 4);
         List<FtFoodDao> list = foodDaoService.list(wrapper);
 
         return AjaxResult.success(list);