...
|
...
|
@@ -246,6 +246,7 @@ public class ShopListServiceImpl implements IShopListService { |
|
|
shop_info.put("tbl_brand", globalBrand);
|
|
|
shop_info.put("yoho_shop", null);
|
|
|
shops_info.add(shop_info);
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
if ("N".equals(isGlobal) && shopId != null && Integer.valueOf(shopId) > 0) {
|
...
|
...
|
@@ -254,6 +255,7 @@ public class ShopListServiceImpl implements IShopListService { |
|
|
shop_info.put("tbl_brand", null);
|
|
|
shop_info.put("yoho_shop", yohoShopInfo);
|
|
|
shops_info.add(shop_info);
|
|
|
continue;
|
|
|
}
|
|
|
}
|
|
|
}
|
...
|
...
|
|