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

platform-shop/src/main/java/com/platform/service/impl/GoodsServiceImpl.java

@@ -188,8 +188,8 @@ public class GoodsServiceImpl implements GoodsService {
                 galleryEntity.setGoodsId(id);
                 goodsGalleryDao.save(galleryEntity);
             }
-        }else if(ObjectUtils.isEmpty(goods.getGoodsImgList()) && !ObjectUtils.isEmpty(goods.getListPicUrl())){
-            String[] images = goods.getListPicUrl().split("#\\$#");
+        }else if(ObjectUtils.isEmpty(goods.getGoodsImgList()) && !ObjectUtils.isEmpty(goods.getPrimaryPicUrl())){
+            String[] images = goods.getPrimaryPicUrl().split("#\\$#");
             for (int i = 0; i < images.length; i++) {
                 GoodsGalleryEntity galleryEntity = new GoodsGalleryEntity();
                 galleryEntity.setGoodsId(goods.getId());