代码合并

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -217,4 +217,17 @@ public class StoreInfoVo extends StoreInfo {
 
     @ApiModelProperty(value = "是否提供餐食")
     private Integer  mealsFlag;
+
+
+    @ApiModelProperty(value = "推荐列表距离(米)")
+    private String distance3;
+
+    @ApiModelProperty(value = "店铺头图（多图列表）")
+    private List<String> storeAlbumUrlList;
+
+    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
+    private String businessClassify;
+
+    @ApiModelProperty(value = "分类名称")
+    private String businessClassifyName;
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/StoreMainInfoVo.java

@@ -44,6 +44,12 @@ public class StoreMainInfoVo extends StoreInfo {
     @ApiModelProperty(value = "菜单")
     List<StoreMenuVo> menuUrl;
 
+    @ApiModelProperty(value = "推荐酒水")
+    List<StoreMenuVo> recommendBeverageUrl;
+
+    @ApiModelProperty(value = "酒水单")
+    List<StoreMenuVo> beverageUrl;
+
     @ApiModelProperty(value = "门店标签")
     StoreLabel storeLabel;
 

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -71,7 +71,6 @@ import java.util.stream.Collectors;
  * @author ssk
  * @since 2024-12-05
  */
-@Slf4j
 @Service
 @Slf4j
 @RequiredArgsConstructor