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

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java

@@ -35,7 +35,7 @@ public class TbShopInfoQueryCriteria{
     private String account;
 
     /** 精确 */
-    @Query(type = Query.Type.LEFT_LIKE)
+    @Query(type = Query.Type.INNER_LIKE)
     private String shopName;
 
     /** 精确 */

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -274,7 +274,7 @@ public class TbShopInfo implements Serializable {
 
     @Column(name = "consume_colony")
     @ApiModelProperty(value = "积分群体 all-所有 vip-仅针对会员")
-    private String consumeColony;
+    private String consumeColony = "all";
 
     @Column(name = "is_table_fee")
     @ApiModelProperty(value = "是否免除桌位费 0否1是")

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java

@@ -186,6 +186,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli());
         tbShopInfo.setOnSale(1);
         tbShopInfo.setIsOpenYhq(resources.getIsOpenYhq());
+        tbShopInfo.setConsumeColony("all");
         //激活码
         TbMerchantRegister tbMerchantRegister = new TbMerchantRegister();
         if (resources.getRegisterCode() != null){