From 38dc6da10ce5dbbfcfadb7e35d9ad008141fbcd5 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 22 Nov 2024 15:05:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=20=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
index 4a7e0ba2..f1488665 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
@@ -17,6 +17,7 @@ package cn.ysk.cashier.dto.shop;
 
 import lombok.Data;
 import cn.ysk.cashier.annotation.Query;
+import org.apache.commons.lang3.StringUtils;
 
 /**
 * @website https://eladmin.vip
@@ -71,4 +72,10 @@ public class TbShopInfoQueryCriteria{
     private Integer size;
 
     private String sort;
+
+    public void setShopName(String shopName) {
+        if(StringUtils.isNotBlank(shopName)){
+            this.shopName = shopName;
+        }
+    }
 }
\ No newline at end of file

From a8ed1b945c226fe40904761db8b643ba3187fcb6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 22 Nov 2024 15:13:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
index f1488665..e4b64d48 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
@@ -39,6 +39,9 @@ public class TbShopInfoQueryCriteria{
     @Query(type = Query.Type.INNER_LIKE)
     private String shopName;
 
+    @Query
+    private String type;
+
     /** 精确 */
     @Query
     private String phone;
@@ -73,6 +76,12 @@ public class TbShopInfoQueryCriteria{
 
     private String sort;
 
+    public void setType(String type) {
+        if(StringUtils.isNotBlank(type)){
+            this.type = type;
+        }
+    }
+
     public void setShopName(String shopName) {
         if(StringUtils.isNotBlank(shopName)){
             this.shopName = shopName;