多店铺需求

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java

@@ -125,17 +125,8 @@ public class ShopUser implements Serializable {
 
     @Column(onInsertValue = "now()", onUpdateValue = "now()")
     private LocalDateTime updateTime;
-
-    /**
-     * 是否已经合并数据到主店 1-是 0-否 默认0
-     */
-    private Integer isMergedToHead;
     /**
      * 已经合并过来的用户信息，jsonArray格式,[{"id":1,"shopId":2,...},{"id":1,"shopId":2,...}]
      */
     private String mergedUsers;
-    /**
-     * 适用门店id集合，逗号分隔，例如：0,1,2,3,...查询的时候 all_shop_ids like '%,1,%';
-     */
-    private String allShopIds;
 }