chore: merge master

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/GoodsDetailsController.java

@@ -165,7 +165,7 @@ public class GoodsDetailsController extends BaseController {
             goodsPictureExample.setSpecValueIdIn(product.getSpecValueIds());
         }
         List<GoodsPicture> goodsPictureList = goodsPictureModel.getGoodsPictureList(goodsPictureExample, null);
-        String webSite = goods.getWebSite();
+        String webSite = WebUtil.getWebSite(request);
         Store store = storeModel.getStoreByStoreId(goods.getStoreId());
         if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)) {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(goods.getStoreId(), webSite);