Merge remote-tracking branch 'origin/test' into test

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
@@ -38,6 +39,9 @@ public class TbShopInfoQueryCriteria{
     @Query(type = Query.Type.INNER_LIKE)
     private String shopName;
 
+    @Query
+    private String type;
+
     /** 精确 */
     @Query
     private String phone;
@@ -71,4 +75,16 @@ public class TbShopInfoQueryCriteria{
     private Integer size;
 
     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;
+        }
+    }
 }